Changeset 5513 for pjproject/branches/projects/uwp/pjlib/include/pj/string_i.h

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/include/pj/string_i.h (modified) (3 diffs)

pjproject/branches/projects/uwp/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);
+    if (max > 0)
+        pj_memcpy(dst->ptr, src->ptr, max);
     dst->slen = max;
     return dst;
@@ -127 +130 @@
                                          pj_ssize_t max)
 {
+    pj_assert(max > 0);
+
     if (max <= src->slen)
         max = max-1;