From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 6 Mar 2014 15:58:13 +0000 (+0000)
Subject: Don't attempt to link in an aggregate MWI subscription if an endpoint does not aggreg... 
X-Git-Tag: 13.0.0-beta1~475
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59ff66ef0275ff9985a3cd3168fc797cf152b38e;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index 4a664c8beb..6856a70018 100644
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -755,7 +755,9 @@ static int create_mwi_subscriptions_for_endpoint(void *obj, void *arg, int flags
 			ao2_cleanup(sub);
 		}
 	}
-	ao2_link(mwi_subscriptions, aggregate_sub);
+	if (aggregate_sub) {
+		ao2_link(mwi_subscriptions, aggregate_sub);
+	}
 	return 0;
 }