commit 2c46e7dedeebac10444636356f79161a60e796e6
author Andreas Schneider <asn@cryptomilk.org> Tue Feb 10 08:07:16 2015 +0100
committer Andreas Schneider <asn@cryptomilk.org> Tue Feb 10 15:49:30 2015 +0100
tree f6648d84bc2665e0b03d08bf60e7416f201528a2
parent 08860c880dddc65e26efd515214b1ab1e3ad25dd

cmocka: Fix length calculation.

CID: #1268624

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

SQ

src/cmocka.c

diff --git a/src/cmocka.c b/src/cmocka.c
index 5b37688..8a7c9e1 100644
--- a/src/cmocka.c
+++ b/src/cmocka.c
@@ -1578,11 +1578,12 @@
         cm_error_message = tmp;
     }
 
-    if (((size_t)len) <= sizeof(buffer)) {
+    if (((size_t)len) < sizeof(buffer)) {
+        /* Use len + 1 to also copy '\0' */
         memcpy(cm_error_message + msg_len, buffer, len + 1);
     } else {
         va_copy(ap, args);
-        vsnprintf(cm_error_message + msg_len, len + 1, format, ap);
+        vsnprintf(cm_error_message + msg_len, len, format, ap);
         va_end(ap);
     }
 }