commit 1a393b683b766f2727db59c1f7f520f118ff31f6
author Mitch Phillips <mitchp@google.com> Mon May 18 15:22:48 2020 +0000
committer Mitch Phillips <mitchp@google.com> Mon May 18 15:22:48 2020 +0000
tree ff9f39a7ee3feef045f1a175e882b10a9c3f11cc
parent 76ce32657d0917244845a51af2075cf124015da9

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

This reverts commit 76ce32657d0917244845a51af2075cf124015da9.

Bug: 154618758
Change-Id: Ie638560454495bd3d0b26376def9930bde0e33c2

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,