From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 2 Sep 2015 14:14:19 +0000 (-0500)
Subject: res_pjsip_pubsub: Fix crash on destruction of empty subscription tree.
X-Git-Tag: 13.7.0-rc1~104^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bcc5927655c71f2ea0db31c0cd0a3bf0095714d;p=thirdparty%2Fasterisk.git

res_pjsip_pubsub: Fix crash on destruction of empty subscription tree.

If an old persistent subscription is recreated but then immediately
destroyed because it is out of date, the subscription tree will have no
leaf subscriptions on it. This was resulting in a crash when attempting
to destroy the subscription tree.

A simple NULL check fixes this problem.

Change-Id: I85570b9e2bcc7260a3fe0ad85904b2a9bf36d2ac
---

diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index dc61786509..75b286b61e 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -1079,6 +1079,10 @@ static void destroy_subscriptions(struct ast_sip_subscription *root)
 {
 	int i;
 
+	if (!root) {
+		return;
+	}
+
 	for (i = 0; i < AST_VECTOR_SIZE(&root->children); ++i) {
 		struct ast_sip_subscription *child;