kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 10:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't attempt to link in an aggregate MWI subscription if an endpoint does not aggregate MWI.

Browse Source 
Attempting to link a NULL object into an ao2 container had been benign previously, but since
enabling DO_CRASH in the testsuite, this is now causing a crash. It's better to be right
here anyway.
........

Merged revisions 410011 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2014-03-06 15:58:13 +00:00
parent 0a4dd1481a
commit 59ff66ef02
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_pjsip_mwi.c
View File

@@ -755,7 +755,9 @@ static int create_mwi_subscriptions_for_endpoint(void *obj, void *arg, int flags
ao2_cleanup(sub); ao2_cleanup(sub);
} }
} }
ao2_link(mwi_subscriptions, aggregate_sub); if (aggregate_sub) {
ao2_link(mwi_subscriptions, aggregate_sub);
}
return 0; return 0;
} }