commit 431305e2ee8341de9f941221fe3c7e0eebca6a77
author Mitch Phillips <mitchp@google.com> Wed Apr 22 19:02:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 22 19:02:18 2020 +0000
tree 012067a858d6f572d3ad5386868ad55db7093ed1
parent e2a42bf69c9ee77fd00c422563d856f5e86aee24
parent e559445b29909020b47215452b3ce0542f093cfd

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

Change-Id: I8a0efea2bbac7e6e613b50f40a12e7306ffe90ae

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,