tor

commit 43cbcd38968bd3c4cb3fe53af2cdc9b0f74dba3c
parent f9aed40156f5a85b35877a086a0a420cbd2fafcb
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 31 Oct 2017 14:31:55 -0400

Merge branch 'maint-0.3.2'

Diffstat:
A
changes/bug24082
 | 
3
+++
M
src/test/fuzz/fuzzing_common.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/bug24082 b/changes/bug24082
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+    - Fix a spurious fuzzing-only use of an uninitialized value.
+      Found by Brian Carpenter. Fixes bug 24082; bugfix on 0.3.0.3-alpha.
diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c
@@ -107,7 +107,7 @@ global_init(void)
   configure_backtrace_handler(get_version());
 
   /* set up the options. */
-  mock_options = tor_malloc(sizeof(or_options_t));
+  mock_options = tor_malloc_zero(sizeof(or_options_t));
   MOCK(get_options, mock_get_options);
 
   /* Make BUG() and nonfatal asserts crash */