commit b7bf3abf7d89cdc695c2cc97560f4b55550fc343
author Christopher Ferris <cferris@google.com> Thu May 23 23:21:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 23 23:21:48 2019 -0700
tree b13f308ba7ff641e1c8c8a39d8746e3c2b000176
parent 4e652b3b34fc95d8e86b45f016032de49cbe1bac
parent 39677eae597913462aa50df9d5c748f2d9377bf6

Merge "Disable malloc debug when asan enabled." am: 497d7169d4
am: 39677eae59

Change-Id: I6d0edb1d0fad919657f1cb8e58b0d20136b6dc77

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;