summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-31 14:31:21 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-31 14:31:21 -0400
commit062751236821f775d9250fd59fc508f27b6839c7 (patch)
tree7ebf31d311cca0509b86ad3900c61f57ff1f3e6d
parentc3ea1ccf04cd0aaa8c33d78c0abd46db68a1346b (diff)
parent5dce134fbb4310704c6e9dcffca61221671d6e47 (diff)
downloadtor-062751236821f775d9250fd59fc508f27b6839c7.tar.gz
tor-062751236821f775d9250fd59fc508f27b6839c7.zip
Merge branch 'bug24082_032' into maint-0.3.2
-rw-r--r--changes/bug240823
-rw-r--r--src/test/fuzz/fuzzing_common.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug24082 b/changes/bug24082
new file mode 100644
index 0000000000..1523239351
--- /dev/null
+++ 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
index 7aee92df63..7ebddde1a8 100644
--- 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 */