[tor-commits] [tor-browser/tor-browser-45.5.1esr-6.5-1] Bug #10281: Use jemalloc4 and abort on redzone corruption

[gk at torproject.org]

commit bd00b14abd3c9dace3ccbce2a4597602bb84a3c7
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Mon Dec 5 09:53:39 2016 -0800

    Bug #10281: Use jemalloc4 and abort on redzone corruption
---
 .mozconfig                       | 4 ++++
 memory/build/jemalloc_config.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.mozconfig b/.mozconfig
index dc2e63b..a419808 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -5,6 +5,10 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
+# Use jemalloc 4.x. In 52ESR, we should use
+# the --enable-jemalloc=4 flag instead:
+export MOZ_JEMALLOC4=1
+
 ac_add_options --enable-optimize
 #ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
diff --git a/memory/build/jemalloc_config.cpp b/memory/build/jemalloc_config.cpp
index 94946d2..1367702 100644
--- a/memory/build/jemalloc_config.cpp
+++ b/memory/build/jemalloc_config.cpp
@@ -29,10 +29,10 @@
 #ifdef DEBUG
 #define MOZ_MALLOC_BUILD_OPTIONS ",junk:true"
 #else
-#define MOZ_MALLOC_BUILD_OPTIONS ",junk:free"
+#define MOZ_MALLOC_BUILD_OPTIONS ",junk:true"
 #endif
 
-#define MOZ_MALLOC_OPTIONS "narenas:1,tcache:false"
+#define MOZ_MALLOC_OPTIONS "narenas:1,tcache:false,redzone:true,abort:true"
 MFBT_DATA const char* je_(malloc_conf) =
   MOZ_MALLOC_OPTIONS MOZ_MALLOC_BUILD_OPTIONS;