commit 50cd19415a6076957586a960bf19e48115a92b86
author Ryan Prichard <rprichard@google.com> Wed Apr 22 21:40:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 22 21:40:29 2020 +0000
tree 255eb08201a25d923c7d00d1f2dba1d88de72ad8
parent e559445b29909020b47215452b3ce0542f093cfd
parent 771da6f500352168a1bc1898495261652415b08e

android_get_exported_namespace: acquire g_dl_mutex am: 771da6f500

Change-Id: Idaf1e452c0c8c6f678eee1091dd1765bc472e037

libc/bionic/gwp_asan_wrappers.cpp

diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp
index d3e6a14..57deeb2 100644
--- a/libc/bionic/gwp_asan_wrappers.cpp
+++ b/libc/bionic/gwp_asan_wrappers.cpp
@@ -177,7 +177,8 @@
 }
 
 static const MallocDispatch gwp_asan_dispatch __attribute__((unused)) = {
-  gwp_asan_calloc,
+  // TODO(b/154618758) - GWP-ASan's calloc is disabled for now.
+  Malloc(calloc),
   gwp_asan_free,
   Malloc(mallinfo),
   gwp_asan_malloc,