summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-21 15:08:17 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-21 15:08:17 -0400
commit8f8a061b0c4724adebb4af1d5ac3edb7381269d5 (patch)
tree8cd3c459b47a15109c0b4b7ef7fe0c2fff6a8f45
parent6f3208670a11cc7f0c5917852d28890b07ab87d2 (diff)
parent10b242822490c9873138565bcc8a3565a7dc7014 (diff)
downloadtor-8f8a061b0c4724adebb4af1d5ac3edb7381269d5.tar.gz
tor-8f8a061b0c4724adebb4af1d5ac3edb7381269d5.zip
Merge branch 'maint-0.3.1'
-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 d3f2dc0644..484f13dd05 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.