diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-29 02:34:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-29 02:34:51 +0000 |
| commit | 1d93888a596ddee6b9040788023f22ca347ed404 (patch) | |
| tree | a129faf279f0ff34a8cea6b63bea36a824f3b9c8 | |
| parent | 37fc3f6691a282acb04785ff504ab70d02354b6a (diff) | |
| parent | f27fa1d20b11501d86205f0f90c4256af653ddb9 (diff) | |
| download | bionic-1d93888a596ddee6b9040788023f22ca347ed404.tar.gz | |
Merge "[GWP-ASan] Don't intercept calloc." into rvc-dev
| -rw-r--r-- | libc/bionic/gwp_asan_wrappers.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp index d3e6a14ce..e60a2f9a5 100644 --- a/libc/bionic/gwp_asan_wrappers.cpp +++ b/libc/bionic/gwp_asan_wrappers.cpp @@ -177,7 +177,8 @@ void gwp_asan_malloc_enable() { } 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, |