nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.3

Browse Source
This commit is contained in:
teor 2019-02-27 09:37:36 +10:00
commit 6c966b894c
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug29145 Normal file
View File

@ -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.

3
src/test/test-memwipe.c
View File

@ -42,7 +42,8 @@ const char *s = NULL;
#ifdef OpenBSD #ifdef OpenBSD
/* Disable some of OpenBSD's malloc protections for this test. This helps /* Disable some of OpenBSD's malloc protections for this test. This helps
* us do bad things, such as access freed buffers, without crashing. */ * 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 #endif
static unsigned static unsigned