kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 10:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_caller_id: Fix crash on session timers UPDATE on inbound calls." into 13

Browse Source
This commit is contained in:
zuul
2016-10-27 16:48:05 -05:00
committed by Gerrit Code Review
parent 12ee2fd58d 675c71ae8c
commit 66044dd606
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/res_pjsip_caller_id.c
View File

@@ -523,8 +523,11 @@ static void add_pai_header(const struct ast_sip_session *session, pjsip_tx_data
}
}
base = tdata->msg->type == PJSIP_REQUEST_MSG ? session->saved_from_hdr :
PJSIP_MSG_TO_HDR(tdata->msg);
if (tdata->msg->type == PJSIP_REQUEST_MSG) {
base = session->saved_from_hdr ? session->saved_from_hdr : PJSIP_MSG_FROM_HDR(tdata->msg);
} else {
base = PJSIP_MSG_TO_HDR(tdata->msg);
}
pai_hdr = create_new_id_hdr(&pj_pai_name, base, tdata, id);
if (!pai_hdr) {
@@ -629,8 +632,11 @@ static void add_rpid_header(const struct ast_sip_session *session, pjsip_tx_data
}
}
base = tdata->msg->type == PJSIP_REQUEST_MSG ? session->saved_from_hdr :
PJSIP_MSG_TO_HDR(tdata->msg);
if (tdata->msg->type == PJSIP_REQUEST_MSG) {
base = session->saved_from_hdr ? session->saved_from_hdr : PJSIP_MSG_FROM_HDR(tdata->msg);
} else {
base = PJSIP_MSG_TO_HDR(tdata->msg);
}
rpid_hdr = create_new_id_hdr(&pj_rpid_name, base, tdata, id);
if (!rpid_hdr) {