commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Jul 11 09:36:24 2018 -0400
When setting a nonstandard malloc, disable the system malloc.
Closes ticket 20424.
---
changes/bug20424_029_minimal | 4 ++++
configure.ac | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 000000000..eb7886233
--- /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 279660d9b..d70032992 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.