commit 11901a2c5aa9aa6d6e9c173fdfe3dad326a5ab99
author Mitch Phillips <mitchp@google.com> Wed Apr 22 19:21:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 22 19:21:03 2020 +0000
tree 012067a858d6f572d3ad5386868ad55db7093ed1
parent 394fe4d1cde08ec2f986c551301e38b84f52dcc3
parent 431305e2ee8341de9f941221fe3c7e0eebca6a77

Merge "[GWP-ASan] Don't intercept calloc." into rvc-d1-dev am: e559445b29 am: 431305e2ee

Change-Id: Ic570c7ad305416f8ac8d7412f201a425bbfd1da1

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,