commit 4ef3781c011627b3bc3c002147c9dc4191c3517b
author Mitch Phillips <mitchp@google.com> Wed Apr 22 18:54:19 2020 +0000
committer Mitch Phillips <mitchp@google.com> Thu Apr 23 00:34:25 2020 +0000
tree ef8dae7f08623a01a9cd07e0e3ab8d37cf3b8e7e
parent ae91780417f80e878965766c8116294bb9a5f066

Revert "[GWP-ASan] Don't intercept calloc."

This reverts commit 76ce32657d0917244845a51af2075cf124015da9.

Bug: 154618758

Reason for revert: Patch only desired in rvc-d1-dev[+aosp]

Change-Id: I7102d4ae5bf9b911c7f6d48515ddf9804eef622f

libc/bionic/gwp_asan_wrappers.cpp

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