Bug #10281: Use jemalloc4 and abort on redzone corruption

arthuredelstein · Dec 6, 2016 · 0b97953b974433c8689f923dbd94d71b554c8719 · 0b97953
1 parent 70b2e47
commit 0b97953b974433c8689f923dbd94d71b554c8719
Showing with 6 additions and 2 deletions.

+4 −0 .mozconfig

+2 −2 memory/build/jemalloc_config.cpp
diff --git 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-jemalloc4 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
@@ -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;