Changeset 5468

Timestamp:

Oct 24, 2016 3:22:46 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1945): Avoid calling memchr() or memcpy() with NULL pointer (thanks Kal from the patch).

Location:

pjproject/trunk

Files:

• pjlib/include/pj/string.h (modified) (1 diff)
• pjlib/include/pj/string_i.h (modified) (1 diff)
• pjsip/include/pjsip/print_util.h (modified) (1 diff)
• pjsip/src/pjsip/sip_msg.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/string.h

@@ -470 +470 @@
 PJ_INLINE(char*) pj_strchr( const pj_str_t *str, int chr)
 {
+    if (str->slen == 0)
+        return NULL;
     return (char*) memchr((char*)str->ptr, chr, str->slen);
 }

pjproject/trunk/pjlib/include/pj/string_i.h

@@ -121 +121 @@
     pj_assert(max >= 0);
     if (max > src->slen) max = src->slen;
-    pj_memcpy(dst->ptr, src->ptr, max);
+    if (max > 0)
+        pj_memcpy(dst->ptr, src->ptr, max);
     dst->slen = max;
     return dst;

pjproject/trunk/pjsip/include/pjsip/print_util.h

@@ -30 +30 @@
         do { \
             if ((str).slen >= (endbuf-buf)) return -1;  \
-            pj_memcpy(buf, (str).ptr, (str).slen); \
-            buf += (str).slen; \
+            if ((str).slen) { \
+                pj_memcpy(buf, (str).ptr, (str).slen); \
+                buf += (str).slen; \
+            } \
         } while (0)
 

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

@@ -2014 +2014 @@
 
     /* Check if host contains IPv6 */
-    if (pj_memchr(hdr->sent_by.host.ptr, ':', hdr->sent_by.host.slen)) {
+    if (pj_strchr(&hdr->sent_by.host, ':')) {
         copy_advance_pair_quote_cond(buf, "", 0, hdr->sent_by.host, '[', ']');
     } else {