From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 17 Sep 2015 21:59:18 +0000 (-0500)
Subject: CHAOS: res_pjsip_diversion avoid crash if allocation fails
X-Git-Tag: 13.6.0-rc1~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cc59533b903b3d55e8b388f28385287e712ae62;p=thirdparty%2Fasterisk.git

CHAOS: res_pjsip_diversion avoid crash if allocation fails

Validate ast_malloc buffer returned before using it in
set_redirecting_value().

ASTERISK-25323

Change-Id: I15d2ed7cb0546818264c0bf251aa40adeae83253
---

diff --git a/res/res_pjsip_diversion.c b/res/res_pjsip_diversion.c
index 49f7892120..4d9aca4a11 100644
--- a/res/res_pjsip_diversion.c
+++ b/res/res_pjsip_diversion.c
@@ -117,7 +117,9 @@ static void set_redirecting_value(char **dst, const pj_str_t *src)
 {
 	ast_free(*dst);
 	*dst = ast_malloc(pj_strlen(src) + 1);
-	ast_copy_pj_str(*dst, src, pj_strlen(src) + 1);
+	if (*dst) {
+		ast_copy_pj_str(*dst, src, pj_strlen(src) + 1);
+	}
 }
 
 static void set_redirecting_id(pjsip_name_addr *name_addr, struct ast_party_id *data,