From: George Joseph <george.joseph@fairview5.com>
Date: Mon, 4 Apr 2016 23:02:09 +0000 (-0600)
Subject: res_pjsip_mwi:  Fix segv caused by 16c7d8e74a9af13f98c3c22aa9c43ce39965f6b7
X-Git-Tag: 14.0.0-beta1~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c07e1190ec02573d80d007b6d7279b14cde8655b;p=thirdparty%2Fasterisk.git

res_pjsip_mwi:  Fix segv caused by 16c7d8e74a9af13f98c3c22aa9c43ce39965f6b7

I forgot the new voicemail_extension wasn't a stringfield and didn't check
for NULL where I should have.

Change-Id: I029482d5c2ab72474838750461bd46b0809c90fb
---

diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index a954c9c66b..f9bfc1904d 100644
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -459,7 +459,8 @@ static struct ast_sip_aor *find_aor_for_resource(struct ast_sip_endpoint *endpoi
 			continue;
 		}
 
-		if (!strcasecmp(check_aor->voicemail_extension, resource)) {
+		if (!ast_strlen_zero(check_aor->voicemail_extension)
+			&& !strcasecmp(check_aor->voicemail_extension, resource)) {
 			ast_debug(1, "Found an aor (%s) that matches voicemail_extension %s\n", aor_name, resource);
 			return check_aor;
 		}