kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 12:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip: Remove spurious error logging when printing silent headers"

Browse Source
This commit is contained in:
Joshua Colp
2018-07-18 05:49:31 -05:00
committed by Gerrit Code Review
parent 259f4868d0 0e8976116f
commit d9596b5090
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
third-party/pjproject/patches/0060-sip_msg-Prevent-crash-on-header-without-vptr.patch vendored
View File

@@ -1,18 +1,22 @@
From cf6b662b8fe450ea7dc6eb5adb2b878971ce0d67 Mon Sep 17 00:00:00 2001 From 88409082a4cbf27b308c76c148270ee72fdcb503 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com> From: Riza Sulistyo <riza@teluu.com>
Date: Wed, 10 Jan 2018 08:48:32 -0700 Date: Wed, 17 Jan 2018 11:30:52 +0000
Subject: [PATCH] sip_msg: Prevent crash on header without vptr Subject: [PATCH] r5727 svn backport sip_msg: Prevent crash on header without
vptr
Re #2059 (misc): Prevent corrupt header from causing a crash when printed.
Thanks to George Joseph for the patch.
Occasionally a header with no vptr gets into the list of header. This Occasionally a header with no vptr gets into the list of header. This
causes a crash when printing them. We still need to figure out how causes a crash when printing them. We still need to figure out how
the header got there but this patch at least prevents the crash by checking the header got there but this patch at least prevents the crash by checking
for a non-NULL vptr before attempting to call its print function. for a non-NULL vptr before attempting to call its print function.
--- ---
pjsip/src/pjsip/sip_msg.c | 6 ++++++ pjsip/src/pjsip/sip_msg.c | 11 +++++++++--
1 file changed, 6 insertions(+) 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c
index 76d07b563..194b5ee01 100644 index a13f80e..8819dd9 100644
--- a/pjsip/src/pjsip/sip_msg.c --- a/pjsip/src/pjsip/sip_msg.c
+++ b/pjsip/src/pjsip/sip_msg.c +++ b/pjsip/src/pjsip/sip_msg.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@@ -23,25 +27,30 @@ index 76d07b563..194b5ee01 100644
#include <pjlib-util/string.h> #include <pjlib-util/string.h>
PJ_DEF_DATA(const pjsip_method) pjsip_invite_method = PJ_DEF_DATA(const pjsip_method) pjsip_invite_method =
@@ -469,6 +470,8 @@ PJ_DEF(pj_ssize_t) pjsip_msg_print( const pjsip_msg *msg, @@ -461,8 +462,13 @@ PJ_DEF(pj_ssize_t) pjsip_msg_print( const pjsip_msg *msg,
/* Print each of the headers. */
for (hdr=msg->hdr.next; hdr!=&msg->hdr; hdr=hdr->next) {
len = pjsip_hdr_print_on(hdr, p, end-p);
- if (len < 0)
- return -1;
+ if (len < 0) {
+ if (len == -2) {
+ PJ_LOG(5, ("sip_msg", "Header with no vptr encountered!! "\
+ "Current buffer: %.*s", (int)(p-buf), buf));
+ }
+ return len;
+ }
*p++ = '\r'; if (len > 0) {
*p++ = '\n'; p += len;
+ } else { @@ -578,6 +584,7 @@ PJ_DEF(void*) pjsip_hdr_shallow_clone( pj_pool_t *pool, const void *hdr_ptr )
+ PJ_LOG(1, ("sip_msg", "Header with no vptr encountered!! Current buffer: %.*s", (int)(p-buf), buf));
}
}
@@ -576,6 +579,9 @@ PJ_DEF(void*) pjsip_hdr_shallow_clone( pj_pool_t *pool, const void *hdr_ptr )
PJ_DEF(int) pjsip_hdr_print_on( void *hdr_ptr, char *buf, pj_size_t len) PJ_DEF(int) pjsip_hdr_print_on( void *hdr_ptr, char *buf, pj_size_t len)
{ {
pjsip_hdr *hdr = (pjsip_hdr*) hdr_ptr; pjsip_hdr *hdr = (pjsip_hdr*) hdr_ptr;
+ if (!hdr->vptr) { + PJ_ASSERT_RETURN(hdr->vptr, -2);
+ return 0;
+ }
return (*hdr->vptr->print_on)(hdr_ptr, buf, len); return (*hdr->vptr->print_on)(hdr_ptr, buf, len);
} }
-- --
2.14.3 2.7.4