commit 5c65e87579dc5799458b4d007a5cb9c958c6e9a1
author Mitch Phillips <mitchp@google.com> Fri Feb 28 08:50:51 2020 -0800
committer Mitch Phillips <mitchp@google.com> Fri Feb 28 16:58:23 2020 +0000
tree 331606578675a60eb974e7638a2f995e8d5480e0
parent 6cf75230d9feae269a823c7dd43433baf1b71465

[GWP-ASan] Don't intercept calloc.

See linked bug for more information.

Bug: 150456936
Test: N/A
Change-Id: Ibdd4331d005cf488e24c238e67e46cee13198334

libc/bionic/gwp_asan_wrappers.cpp

diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp
index d3e6a14..e60a2f9 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/150456936) - GWP-ASan's calloc is disabled for now.
+  Malloc(calloc),
   gwp_asan_free,
   Malloc(mallinfo),
   gwp_asan_malloc,