diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 17:26:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 17:26:16 +0000 |
| commit | ccf5c83645c5c794fe55d4b052112517114c8230 (patch) | |
| tree | 9472151064397020184693cead110803435664de | |
| parent | 29525818f6395025e8772a54ab65e09ecd645df1 (diff) | |
| parent | 87494705247a6df3167686e4b2876ef87a30c4d2 (diff) | |
| download | bionic-ccf5c83645c5c794fe55d4b052112517114c8230.tar.gz | |
Merge "Revert "[GWP-ASan] Don't intercept calloc."" into rvc-d1-dev am: 8749470524
Change-Id: I52349980c528046d513a0fc09c7fc745901930a1
| -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, |