diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-02-19 11:49:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-02-19 11:49:20 -0500 |
| commit | 4bc55ed5ee5aefa1d86aca34bc5bfba2f24086f3 (patch) | |
| tree | b68fd182624f15e2047ea975dfee53098e6381b7 | |
| parent | b5f3a3d6a76ffd7727833c2b1901629c9f23a99d (diff) | |
| parent | 4417ac880a7f1306574365fd9cf4da2a41ac14ef (diff) | |
| download | tor-4bc55ed5ee5aefa1d86aca34bc5bfba2f24086f3.tar.gz tor-4bc55ed5ee5aefa1d86aca34bc5bfba2f24086f3.zip | |
Merge branch 'bug29145_029' into maint-0.4.0
| -rw-r--r-- | changes/bug29145 | 3 | ||||
| -rw-r--r-- | src/test/test-memwipe.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug29145 b/changes/bug29145 new file mode 100644 index 0000000000..40d3da4b91 --- /dev/null +++ b/changes/bug29145 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, testing): + - Silence a compiler warning in test-memwipe.c on OpenBSD. Fixes + bug 29145; bugfix on 0.2.9.3-alpha. Patch from Kris Katterjohn. diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index 15e6a03d8a..43754ed1c2 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -47,7 +47,8 @@ const char *s = NULL; #ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ -const char *malloc_options="sufjj"; +extern const char *malloc_options; +const char *malloc_options = "sufjj"; #endif static unsigned |