diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-11 09:36:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-11 09:37:29 -0400 |
| commit | 16bdbddc2cab90e360002b3440a4ed634e3c87f1 (patch) | |
| tree | bb30e121cb4d0cb5d5c8015e8777e98ea5d15725 | |
| parent | 8b53dfc3626f293f821b8e8afe88cca62224f20b (diff) | |
| download | tor-16bdbddc2cab90e360002b3440a4ed634e3c87f1.tar.gz tor-16bdbddc2cab90e360002b3440a4ed634e3c87f1.zip | |
When setting a nonstandard malloc, disable the system malloc.
Closes ticket 20424.
| -rw-r--r-- | changes/bug20424_029_minimal | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal new file mode 100644 index 0000000000..eb7886233e --- /dev/null +++ b/changes/bug20424_029_minimal @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell + the compiler not to include the system malloc implementation. Fixes bug + 20424; bugfix on 0.2.0.20-rc. diff --git a/configure.ac b/configure.ac index 279660d9b2..d700329925 100644 --- a/configure.ac +++ b/configure.ac @@ -1438,6 +1438,10 @@ fi if test "$using_custom_malloc" = "no"; then AC_CHECK_FUNCS(mallinfo) fi +if test "$using_custom_malloc" = "yes"; then + # Tell the C compiler not to use the system allocator functions. + TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc -fno-builtin-calloc -fno-builtin-free]) +fi # By default, we're going to assume we don't have mlockall() # bionic and other platforms have various broken mlockall subsystems. |