From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 10 Feb 2015 07:07:16 +0000 (+0100)
Subject: cmocka: Fix length calculation.
X-Git-Tag: cmocka-1.1.1~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c46e7dedeebac10444636356f79161a60e796e6;p=platform%2Fupstream%2Fcmocka.git

cmocka: Fix length calculation.

CID: #1268624

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

SQ
---

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 @@ static void vcm_print_error(const char* const format, va_list args)
         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);
     }
 }