diff options
| author | teor <teor@torproject.org> | 2019-02-27 09:38:04 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-02-27 09:38:04 +1000 |
| commit | 15dc33849eda4fba651bf4096a9e405d737a977b (patch) | |
| tree | d5b45fe34e58ed550028fedb475a21801b691ee8 | |
| parent | 1216f99534319f4739cd6b90f7aa3633191c2179 (diff) | |
| parent | 1a194beb2c01999e08010b44c279cbaaeeadf86c (diff) | |
| download | tor-15dc33849eda4fba651bf4096a9e405d737a977b.tar.gz tor-15dc33849eda4fba651bf4096a9e405d737a977b.zip | |
Merge branch 'maint-0.3.4' into maint-0.3.5
| -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 |