diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 15:19:23 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 15:19:23 +0000 |
| commit | b364a6b7d542ac56213958bbcadadfd5e4596aeb (patch) | |
| tree | 23ad0f63d571eff8908b0cd3f5a47924e31fbe35 /base | |
| parent | 7d79300625a281603027fee9076d522c20b5d011 (diff) | |
| download | chromium_src-b364a6b7d542ac56213958bbcadadfd5e4596aeb.zip chromium_src-b364a6b7d542ac56213958bbcadadfd5e4596aeb.tar.gz chromium_src-b364a6b7d542ac56213958bbcadadfd5e4596aeb.tar.bz2 | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) |