| commit | d92b03887d064518e0ecf4b76ab8ad198867acab | [log] [tgz] |
|---|---|---|
| author | Mitch Phillips <mitchp@google.com> | Mon Mar 16 20:18:04 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Mar 16 20:18:04 2020 +0000 |
| tree | eb1d33aaca6122db21133a752e75e5c2b16d1924 | |
| parent | 69046e084236393ce6a65e5e6c7feba8776e5664 [diff] | |
| parent | 32abb0b81e4e4d57d0c63f6e5637cdc8668de758 [diff] |
Merge "[GWP-ASan] Intercept calloc() again."
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,