projects
/
platform
/
upstream
/
cmocka.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08860c8
)
cmocka: Fix length calculation.
author
Andreas Schneider
<asn@cryptomilk.org>
Tue, 10 Feb 2015 07:07:16 +0000
(08:07 +0100)
committer
Andreas Schneider
<asn@cryptomilk.org>
Tue, 10 Feb 2015 14:49:30 +0000
(15:49 +0100)
CID: #1268624
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
SQ
src/cmocka.c
patch
|
blob
|
history
diff --git
a/src/cmocka.c
b/src/cmocka.c
index
5b37688
..
8a7c9e1
100644
(file)
--- 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);
}
}