commit 3f6adfeb0f0358a6cf4107e06e7d5fabed279f1c
author Ryan Prichard <rprichard@google.com> Wed Apr 22 21:55:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 22 21:55:49 2020 +0000
tree 012067a858d6f572d3ad5386868ad55db7093ed1
parent e85de79ad513226c14cdadae8461d119d0ee7518
parent 787715e58a9c2f32b4db63453a3dfa2286969063

android_get_exported_namespace: acquire g_dl_mutex am: 771da6f500 am: 787715e58a

Change-Id: I813bb1fa0d07bb690d5bc46ef4b26cce0b764b8e

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,