commit 497d7169d47f47a62e01f2bc85755a364645117d
author Christopher Ferris <cferris@google.com> Fri May 24 05:44:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 24 05:44:56 2019 +0000
tree c040ded19a9f66174b8110a21e7ee244a87e2345
parent 30d4c6fb06b343d591e85a16345bf6b927420ea1
parent 705de3c6398d53b780d731008bafc3c2dafbbf85

Merge "Disable malloc debug when asan enabled."

libc/malloc_debug/malloc_debug.cpp

diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp
index 53fcead..c030d54 100644
--- a/libc/malloc_debug/malloc_debug.cpp
+++ b/libc/malloc_debug/malloc_debug.cpp
@@ -252,12 +252,19 @@
   return g_debug->GetPointer(header);
 }
 
+extern "C" void __asan_init() __attribute__((weak));
+
 bool debug_initialize(const MallocDispatch* malloc_dispatch, bool* zygote_child,
                       const char* options) {
   if (zygote_child == nullptr || options == nullptr) {
     return false;
   }
 
+  if (__asan_init != 0) {
+    error_log("malloc debug cannot be enabled alongside ASAN");
+    return false;
+  }
+
   InitAtfork();
 
   g_zygote_child = zygote_child;