[tbb-commits] [tor-browser/tor-browser-52.1.0esr-7.0-2] Revert "Bug 10281: Use jemalloc4 and abort on redzone corruption"

[gk at torproject.org]

commit 93c00dbe36ed4cd3a6b6bb745fce2105d3a0d061
Author: Georg Koppen <gk at torproject.org>
Date:   Sat Jun 3 19:11:03 2017 +0000

    Revert "Bug 10281: Use jemalloc4 and abort on redzone corruption"
    
    This reverts commit b9e3e965adc6929383f8d30ba893ea5eb4fbc55c.
---
 .mozconfig                       | 1 -
 memory/build/jemalloc_config.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.mozconfig b/.mozconfig
index 4eeb339..7d9ab1c 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -26,4 +26,3 @@ ac_add_options --disable-webrtc
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 #ac_add_options --disable-ctypes
-ac_add_options --enable-jemalloc=4
diff --git a/memory/build/jemalloc_config.cpp b/memory/build/jemalloc_config.cpp
index 7962147..441fd8a 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:true"
+#define MOZ_MALLOC_BUILD_OPTIONS ",junk:free"
 #endif
 
-#define MOZ_MALLOC_OPTIONS "narenas:1,tcache:false,redzone:true,abort:true"
+#define MOZ_MALLOC_OPTIONS "narenas:1,tcache:false"
 MFBT_DATA const char* je_(malloc_conf) =
   MOZ_MALLOC_OPTIONS MOZ_MALLOC_BUILD_OPTIONS;