| commit | c61f25f47f209c097db0cbc52a00e879428b69d0 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 28 21:27:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 28 21:27:29 2020 +0000 |
| tree | b1f71f2725410bd9a9f0594870fb1886d2515aa9 | |
| parent | 85cf71fa3d5ad12814f3c5d53bef4f6ee8cf44ed [diff] | |
| parent | 95c772f734ce8c4686035886ca4b7f234aaadcf4 [diff] |
Merge "[GWP-ASan] Don't intercept calloc." am: 95c772f734 Change-Id: Ifa001a6bcd53cdd9aa7491b2f9951ba387a1fdf0
diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp index d3e6a14..e60a2f9 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/150456936) - GWP-ASan's calloc is disabled for now. + Malloc(calloc), gwp_asan_free, Malloc(mallinfo), gwp_asan_malloc,