[asterisk-commits] mmichelson: trunk r410012 - in /trunk: ./ res/res_pjsip_mwi.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Mar  6 09:58:13 2014
New Revision: 410012

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410012
Log:
Don't attempt to link in an aggregate MWI subscription if an endpoint does not aggregate MWI.

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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_mwi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_pjsip_mwi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_mwi.c?view=diff&rev=410012&r1=410011&r2=410012
==============================================================================
--- trunk/res/res_pjsip_mwi.c (original)
+++ trunk/res/res_pjsip_mwi.c Thu Mar  6 09:58:13 2014
@@ -755,7 +755,9 @@
 			ao2_cleanup(sub);
 		}
 	}
-	ao2_link(mwi_subscriptions, aggregate_sub);
+	if (aggregate_sub) {
+		ao2_link(mwi_subscriptions, aggregate_sub);
+	}
 	return 0;
 }