diff options
| author | George Joseph <gjoseph@digium.com> | 2017-11-10 09:37:16 -0700 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-11-13 16:50:07 -0500 |
| commit | f6ebd16bb8c45de2ae86e013bae4651a6083055e (patch) | |
| tree | dce5ffea10b98a2216957cde03a839bb7a10a87f /third-party | |
| parent | 9eacd55c7191a460fe8704f81b9e5e3beaf014b9 (diff) | |
bundled_pjproject: sip_parser: Fix return code in pjsip_find_msg
The default return code for pjsip_find_msg was PJ_SUCCESS so if
a Content-Length header wasn't found at all, pjsip_find_msg was
returning PJ_SUCCESS instead of PJSIP_EMISSINGHDR.
Also added the volatile keyword to a few variables that are used
both inside and outside the PJ_TRY/PJ_CATCH block.
Partial fix for ASTERISK_27408
Change-Id: If82ba9de921e3d57df9c68cf96ee45ccc1491f7a
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/pjproject/patches/0021-sip_parser-Fix-return-code-in-pjsip_find_msg-and-add.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/0021-sip_parser-Fix-return-code-in-pjsip_find_msg-and-add.patch b/third-party/pjproject/patches/0021-sip_parser-Fix-return-code-in-pjsip_find_msg-and-add.patch new file mode 100644 index 000000000..86d5aa7dd --- /dev/null +++ b/third-party/pjproject/patches/0021-sip_parser-Fix-return-code-in-pjsip_find_msg-and-add.patch @@ -0,0 +1,41 @@ +From 186f82627c40d0c3a56a6a94ce55c055ad1f7620 Mon Sep 17 00:00:00 2001 +From: George Joseph <gjoseph@digium.com> +Date: Fri, 10 Nov 2017 09:26:29 -0700 +Subject: [PATCH] sip_parser: Fix return code in pjsip_find_msg and add + "volatile" + +The default return code for pjsip_find_msg was PJ_SUCCESS so if +a Content-Length header wasn't found at all, pjsip_find_msg was +returning PJ_SUCCESS instead of PJSIP_EMISSINGHDR. + +Also added the volatile keyword to a few variables what are used +both insude and outsude the PJ_TRY/PJ_CATCH block. +--- + pjsip/src/pjsip/sip_parser.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pjsip/src/pjsip/sip_parser.c b/pjsip/src/pjsip/sip_parser.c +index f9a0e65b5..f65ffca5a 100644 +--- a/pjsip/src/pjsip/sip_parser.c ++++ b/pjsip/src/pjsip/sip_parser.c +@@ -834,13 +834,13 @@ PJ_DEF(pj_status_t) pjsip_find_msg( const char *buf, pj_size_t size, + pj_bool_t is_datagram, pj_size_t *msg_size) + { + #if PJ_HAS_TCP +- const char *hdr_end; +- const char *body_start; ++ const char *volatile hdr_end; ++ const char *volatile body_start; + const char *pos; +- const char *line; ++ const char *volatile line; + int content_length = -1; + pj_str_t cur_msg; +- pj_status_t status = PJ_SUCCESS; ++ volatile pj_status_t status = PJSIP_EMISSINGHDR; + const pj_str_t end_hdr = { "\n\r\n", 3}; + + *msg_size = size; +-- +2.13.6 + |