diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 17:12:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-18 17:12:06 +0000 |
| commit | 87494705247a6df3167686e4b2876ef87a30c4d2 (patch) | |
| tree | 9472151064397020184693cead110803435664de | |
| parent | 9dd5086d6f0464657330afeb32e94ba5c38a2843 (diff) | |
| parent | 1a393b683b766f2727db59c1f7f520f118ff31f6 (diff) | |
| download | bionic-87494705247a6df3167686e4b2876ef87a30c4d2.tar.gz | |
Merge "Revert "[GWP-ASan] Don't intercept calloc."" into rvc-d1-dev
| -rw-r--r-- | libc/bionic/gwp_asan_wrappers.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp index 57deeb23f..d3e6a14ce 100644 --- a/libc/bionic/gwp_asan_wrappers.cpp +++ b/libc/bionic/gwp_asan_wrappers.cpp @@ -177,8 +177,7 @@ void gwp_asan_malloc_enable() { } static const MallocDispatch gwp_asan_dispatch __attribute__((unused)) = { - // TODO(b/154618758) - GWP-ASan's calloc is disabled for now. - Malloc(calloc), + gwp_asan_calloc, gwp_asan_free, Malloc(mallinfo), gwp_asan_malloc, |