| commit | e559445b29909020b47215452b3ce0542f093cfd | [log] [tgz] |
|---|---|---|
| author | Mitch Phillips <mitchp@google.com> | Wed Apr 22 18:53:23 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 22 18:53:23 2020 +0000 |
| tree | 4cd1f3b9a75a673c3e385f403b7139abd8a807a0 | |
| parent | 447735203c4308d1bf66c0e285cec27bb9c0821e [diff] | |
| parent | 76ce32657d0917244845a51af2075cf124015da9 [diff] |
Merge "[GWP-ASan] Don't intercept calloc." into rvc-d1-dev
diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp index d3e6a14..57deeb2 100644 --- a/libc/bionic/gwp_asan_wrappers.cpp +++ b/libc/bionic/gwp_asan_wrappers.cpp
@@ -177,7 +177,8 @@ } static const MallocDispatch gwp_asan_dispatch __attribute__((unused)) = { - gwp_asan_calloc, + // TODO(b/154618758) - GWP-ASan's calloc is disabled for now. + Malloc(calloc), gwp_asan_free, Malloc(mallinfo), gwp_asan_malloc,