Changeset 1361

Timestamp:

Jun 11, 2007 5:02:52 PM (17 years ago)

Author:

bennylp

Message:

Ticket #333: Added buffer overflow detection in vsprintf emulation for Symbian

File:

• pjproject/trunk/pjlib/src/pj/compat/string_compat.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/compat/string_compat.c

@@ -20 +20 @@
 #include <pj/compat/string.h>
 #include <pj/ctype.h>
+#include <pj/assert.h>
+
 
 #if defined(PJ_HAS_STRING_H) && PJ_HAS_STRING_H != 0
@@ -65 +67 @@
 PJ_DEF(int) vsnprintf(char *s1, pj_size_t len, const char *s2, va_list arg)
 {
-    PJ_UNUSED_ARG(len);
-    return vsprintf(s1,s2,arg);
+#define MARK_CHAR   ((char)255)
+    int rc;
+
+    s1[len-1] = MARK_CHAR;
+
+    rc = vsprintf(s1,s2,arg);
+
+    pj_assert(s1[len-1] == MARK_CHAR || s1[len-1] == '\0');
+
+    return rc;
 }