diff options
| author | teor <teor@torproject.org> | 2019-02-27 09:37:50 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-02-27 09:37:50 +1000 |
| commit | 1a194beb2c01999e08010b44c279cbaaeeadf86c (patch) | |
| tree | d2acae75082c66803c926f7babd32d4aa11f666b | |
| parent | a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7 (diff) | |
| parent | 6c966b894c2115d18ad5aecc7d02e7b96fea1daf (diff) | |
| download | tor-1a194beb2c01999e08010b44c279cbaaeeadf86c.tar.gz tor-1a194beb2c01999e08010b44c279cbaaeeadf86c.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
| -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 aaaf2e7f68..9e7dff5f63 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -42,7 +42,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 |