From 4cc59533b903b3d55e8b388f28385287e712ae62 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 17 Sep 2015 16:59:18 -0500 Subject: [PATCH] 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 --- res/res_pjsip_diversion.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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, -- 2.47.2