sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_pjsip.c: Fix crash from corrupt saved SUBSCRIBE message."

This commit is contained in:
Mark Michelson 2015-08-12 13:08:02 -05:00 committed by Gerrit Code Review
parent a87e2dd254 f3f5b45d57
commit cf45868984
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_pjsip.c
View File

@ -2645,6 +2645,12 @@ int ast_sip_create_rdata(pjsip_rx_data *rdata, char *packet, const char *src_nam
{
pj_str_t tmp;
/*
* Initialize the error list in case there is a parse error
* in the given packet.
*/
pj_list_init(&rdata->msg_info.parse_err);
rdata->tp_info.transport = PJ_POOL_ZALLOC_T(rdata->tp_info.pool, pjsip_transport);
if (!rdata->tp_info.transport) {
return -1;
@ -2655,7 +2661,7 @@ int ast_sip_create_rdata(pjsip_rx_data *rdata, char *packet, const char *src_nam
rdata->pkt_info.src_port = src_port;
pjsip_parse_rdata(packet, strlen(packet), rdata);
if (!rdata->msg_info.msg) {
if (!rdata->msg_info.msg || !pj_list_empty(&rdata->msg_info.parse_err)) {
return -1;
}