Changeset 4613 for pjproject/trunk/pjlib/src/pj/errno.c

Timestamp:

Oct 8, 2013 9:08:13 AM (11 years ago)

Author:

bennylp

Message:

Re #1703: fixing general bugs. First installment: correct handling of snprintf return value

File:

• pjproject/trunk/pjlib/src/pj/errno.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/errno.c

@@ -92 +92 @@
 static int pjlib_error(pj_status_t code, char *buf, pj_size_t size)
 {
+    int len;
+
 #if defined(PJ_HAS_ERROR_STRING) && PJ_HAS_ERROR_STRING!=0
     unsigned i;
@@ -106 +108 @@
 #endif
 
-    return pj_ansi_snprintf( buf, size, "Unknown pjlib error %d", code);
+    len = pj_ansi_snprintf( buf, size, "Unknown pjlib error %d", code);
+    if (len < 1 || len >= (int)size)
+        len = size - 1;
+    return len;
 }
 
@@ -200 +205 @@
     }
 
-    if (len < 1) {
-        *buf = '\0';
-        len = 0;
+    if (len < 1 || len >= (int)bufsize) {
+        len = bufsize - 1;
+        buf[len] = '\0';
     }