aboutsummaryrefslogtreecommitdiff
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
commitb5873fa7778bb3080f5bd38e34c8533da497362b (patch)
tree82d45748f095fb6aa938947d7170c92a0ebbef3e
parentf4e033288e929c9e1cb2ca5b374b70cd363cff31 (diff)
parent800797e7f3c6cfacbf9655ef7d57ba96028a5c06 (diff)
downloadtor-b5873fa7778bb3080f5bd38e34c8533da497362b.tar.gz
tor-b5873fa7778bb3080f5bd38e34c8533da497362b.zip
Merge branch 'maint-0.2.8' into release-0.2.8
-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 5d4fcec664..2cb4215b61 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -76,7 +76,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.