Merge "CHAOS: res_pjsip_diversion avoid crash if allocation fails" into 13

10 years ago · 16f1598b31
parent c02f07b8c4 4cc59533b9
commit 16f1598b31
1 changed files with 3 additions and 1 deletions
--- 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,