summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-13 12:57:58 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-13 12:57:58 -0500
commitdbb9ec494f61bb994a310f5cef849e0fdde30efd (patch)
treebf1f35534b277e2e81317710b4f150eef44f8af6
parent97c3fac6d4761ce441d6e1926d39e71700da2261 (diff)
parent543fd89fb7fe4817b5e59beb132f5331ee7a2f48 (diff)
downloadtor-dbb9ec494f61bb994a310f5cef849e0fdde30efd.tar.gz
tor-dbb9ec494f61bb994a310f5cef849e0fdde30efd.zip
Merge branch 'maint-0.2.9' into release-0.2.9
-rw-r--r--changes/bug232913
-rw-r--r--src/test/test-memwipe.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug23291 b/changes/bug23291
new file mode 100644
index 0000000000..a5b0efda0a
--- /dev/null
+++ b/changes/bug23291
@@ -0,0 +1,3 @@
+ o Minor bugfixes (testing):
+ - Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
+ 0.2.7.2-alpha. Found and patched by Ties Stuij.
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 21882448c3..fd6457416a 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -82,7 +82,7 @@ static unsigned
check_a_buffer(void)
{
unsigned int i;
- volatile char buf[1024];
+ volatile char buf[BUF_LEN];
unsigned sum = 0;
/* See if this buffer has the string in it.