Changeset 5727 for pjproject/trunk/pjsip/src/pjsip/sip_msg.c

Timestamp:

Jan 17, 2018 11:30:52 AM (6 years ago)

Author:

riza

Message:

Re #2059 (misc): Prevent corrupt header from causing a crash when printed.
Thanks to George Joseph for the patch.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_msg.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -27 +27 @@
 #include <pj/pool.h>
 #include <pj/assert.h>
+#include <pj/log.h>
 #include <pjlib-util/string.h>
 
@@ -460 +461 @@
     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;
+        }
 
         if (len > 0) {
@@ -577 +583 @@
 {
     pjsip_hdr *hdr = (pjsip_hdr*) hdr_ptr;
+    PJ_ASSERT_RETURN(hdr->vptr, -2);
     return (*hdr->vptr->print_on)(hdr_ptr, buf, len);
 }