diff options
author | Joshua Colp <jcolp@digium.com> | 2016-04-21 16:25:00 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-04-21 16:25:00 -0500 |
commit | 6112a94d03cd2fd64785c6dfba58f255f5644def (patch) | |
tree | 634df9204217fc26229c6e6a98acb5f723777bd0 | |
parent | e750ea9b5bae47dc6127631dfefc4fb969ab9160 (diff) | |
parent | 516c626a7d59bba52ae5e556d90dd6b6aa068a86 (diff) |
Merge "res_pjsip_callerid: Clear out display name if id->name is not valid" into 13
-rw-r--r-- | res/res_pjsip_caller_id.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c index 9af2a8a64..efa1b89a8 100644 --- a/res/res_pjsip_caller_id.c +++ b/res/res_pjsip_caller_id.c @@ -424,6 +424,12 @@ static pjsip_fromto_hdr *create_new_id_hdr(const pj_str_t *hdr_name, pjsip_fromt ast_escape_quoted(id->name.str, name_buf, name_buf_len); pj_strdup2(tdata->pool, &id_name_addr->display, name_buf); + } else { + /* + * We need to clear the remnants of the clone or it'll be left set. + * pj_strdup2 is safe to call with a NULL src and it resets both slen and ptr. + */ + pj_strdup2(tdata->pool, &id_name_addr->display, NULL); } pj_strdup2(tdata->pool, &id_uri->user, id->number.str); |