From b364a6b7d542ac56213958bbcadadfd5e4596aeb Mon Sep 17 00:00:00 2001 From: "earthdok@chromium.org" Date: Tue, 25 Jun 2013 15:19:23 +0000 Subject: Don't override system malloc when built with LeakSanitizer. Since LeakSanitizer intercepts malloc, we must disable Chromium's malloc override, just like we do with ASan/MSan/TSan. BUG=none R=mark@chromium.org Review URL: https://chromiumcodereview.appspot.com/17654007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208490 0039d316-1c4b-4281-b951-d872f2087c98 --- base/process_util_linux.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index 3315801..e080999 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -69,7 +69,7 @@ void OnNoMemory() { } // namespace #if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \ - !defined(THREAD_SANITIZER) + !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER) #if defined(LIBC_GLIBC) && !defined(USE_TCMALLOC) -- cgit v1.1