| commit | 736c559467c787d9c6f0dc9c6cd27f5f88d58038 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 17 16:24:51 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 17 16:24:51 2020 +0000 |
| tree | 260aeee8ebec2e07fe81669b76bdf55148537391 | |
| parent | 7a17cb4e501837271cc7fc70d3be67c506f584d6 [diff] | |
| parent | 516a0ef9712755d88902f073c0e090d914af7c97 [diff] |
Merge "[GWP-ASan] Intercept calloc() again." into rvc-dev
diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp index e60a2f9..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/150456936) - GWP-ASan's calloc is disabled for now. - Malloc(calloc), + gwp_asan_calloc, gwp_asan_free, Malloc(mallinfo), gwp_asan_malloc,