Changeset 5468 for pjproject/trunk/pjsip/include/pjsip/print_util.h

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).

File:

• pjproject/trunk/pjsip/include/pjsip/print_util.h (modified) (1 diff)

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)