Merge "[GWP-ASan] Intercept calloc() again." am: d92b03887d

Change-Id: I96670156a22bfc3a673eb045266f975e3fc9d191
2020-03-16 20:42:28 +00:00 · 2020-03-16 20:42:28 +00:00 · cb7f2a7905
commit cb7f2a7905
parent e217675532 d92b03887d
1 changed files with 1 additions and 2 deletions
--- a/libc/bionic/gwp_asan_wrappers.cpp
+++ b/libc/bionic/gwp_asan_wrappers.cpp
@ -177,8 +177,7 @@ void gwp_asan_malloc_enable() {
 }

 static const MallocDispatch gwp_asan_dispatch __attribute__((unused)) = {
-  // TODO(b/150456936) - GWP-ASan's calloc is disabled for now.
-  Malloc(calloc),
+  gwp_asan_calloc,
  gwp_asan_free,
  Malloc(mallinfo),
  gwp_asan_malloc,