Changeset 2914 for releases

Timestamp:

04/26/06 10:08:09 (3 years ago)

Author:

aj

Message:

make sure buffer is 0 terminated.

Files:

• releases/opensc-0.11.0/src/libopensc/log.c (modified) (2 diffs)

releases/opensc-0.11.0/src/libopensc/log.c

@@ -99 +99 @@
 
         if (file != NULL) {
-                r = snprintf(buf, sizeof(buf), "%s:%d:%s: ", file, line, func ? func : "");
-                if (r < 0 || (unsigned int)r > sizeof(buf))
+                r = snprintf(buf, sizeof(buf)-1, "%s:%d:%s: ", file, line, func ? func : "");
+                if (r < 0 || (unsigned int)r >= sizeof(buf))
                         return;
         } else {
@@ -108 +108 @@
         left = sizeof(buf) - r;
 
-        r = vsnprintf(p, left, format, args);
+        r = vsnprintf(p, left-1, format, args);
         if (r < 0)
                 return;
         p += r;
         left -= r;
+        /* make sure the string is 0 terminated */
+        buf[sizeof(buf)-1] = 0;
 
         display_fn(ctx, buf);