summaryrefslogtreecommitdiff
path: root/src/util/Assert.cpp
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2011-03-10 21:05:13 +0000
committerMorgan Deters <mdeters@gmail.com>2011-03-10 21:05:13 +0000
commit0f4764b2f0e64be5df31cd87a27363cf59045665 (patch)
tree5e48030ea6087b3dfe66e9c37d790b2394070132 /src/util/Assert.cpp
parent9be1d8fe09cdc0e5b5b3478f7dab16a218802ec1 (diff)
Fix bug 246 (occasional buffer overflow related to varargs in assertion-failure string construction) and addition of an assert_white unit test check for the issue
Diffstat (limited to 'src/util/Assert.cpp')
-rw-r--r--src/util/Assert.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/Assert.cpp b/src/util/Assert.cpp
index 84f970e87..ea0b26248 100644
--- a/src/util/Assert.cpp
+++ b/src/util/Assert.cpp
@@ -54,7 +54,7 @@ void AssertionException::construct(const char* header, const char* extra,
if(size < n) {
va_list args_copy;
va_copy(args_copy, args);
- size += vsnprintf(buf + size, n - size, fmt, args);
+ size += vsnprintf(buf + size, n - size, fmt, args_copy);
va_end(args_copy);
if(size < n) {
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback