Changeset 5229 for pjproject/trunk/pjlib/include/pj/string_i.h

Timestamp:

Dec 31, 2015 5:06:03 AM (9 years ago)

Author:

ming

Message:

Re #1882 (misc): Add assertion checks in pj_strncpy() and pj_strncpy_with_null(). When max is negative, it may go undetected and cause crash since it will be cast to an unsigned when calling pj_memcpy().

Thanks to Dusan Klinec for the suggestion.

File:

• pjproject/trunk/pjlib/include/pj/string_i.h (modified) (3 diffs)

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

@@ -19 +19 @@
  */
 
+#include <pj/assert.h>
 #include <pj/pool.h>
 
@@ -118 +119 @@
                                pj_ssize_t max)
 {
+    pj_assert(max >= 0);
     if (max > src->slen) max = src->slen;
     pj_memcpy(dst->ptr, src->ptr, max);
@@ -127 +129 @@
                                          pj_ssize_t max)
 {
+    pj_assert(max > 0);
+
     if (max <= src->slen)
         max = max-1;