diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-08-21 15:08:17 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-08-21 15:08:17 -0400 |
commit | 882dd4de0b5dd13674ff4530af0c8c43b389ff33 (patch) | |
tree | 0f9706e921616e239360c42025dbde8095fdbfa0 | |
parent | 9944fd92ceaa1614d6a54e47c39c2670c4fd66af (diff) | |
parent | 10b242822490c9873138565bcc8a3565a7dc7014 (diff) | |
download | tor-882dd4de0b5dd13674ff4530af0c8c43b389ff33.tar.gz tor-882dd4de0b5dd13674ff4530af0c8c43b389ff33.zip |
Merge branch 'maint-0.3.1' into release-0.3.1
-rw-r--r-- | changes/bug23291 | 3 | ||||
-rw-r--r-- | src/test/test-memwipe.c | 2 |
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. |