Snap for 6465939 from 7e486eab1fb599fda8d7b67e50ddd726db0bdad7 to mainline-release
Change-Id: Ia6cc9e9ea9a0cfeae1316aad80e6734bbfc47db8
diff --git a/libc/bionic/gwp_asan_wrappers.cpp b/libc/bionic/gwp_asan_wrappers.cpp
index 57deeb2..d3e6a14 100644
--- a/libc/bionic/gwp_asan_wrappers.cpp
+++ b/libc/bionic/gwp_asan_wrappers.cpp
@@ -177,8 +177,7 @@
}
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,
diff --git a/tests/clang_fortify_tests.cpp b/tests/clang_fortify_tests.cpp
index 018880f..715f9c8 100644
--- a/tests/clang_fortify_tests.cpp
+++ b/tests/clang_fortify_tests.cpp
@@ -167,6 +167,8 @@
EXPECT_FORTIFY_DEATH(memcpy(small_buffer, large_buffer, sizeof(large_buffer)));
// expected-error@+1{{will always overflow}}
EXPECT_FORTIFY_DEATH(memmove(small_buffer, large_buffer, sizeof(large_buffer)));
+ // FIXME(gbiv): look into removing mempcpy's diagnose_if bits once the b/149839606 roll sticks.
+ // expected-error@+2{{will always overflow}}
// expected-error@+1{{size bigger than buffer}}
EXPECT_FORTIFY_DEATH(mempcpy(small_buffer, large_buffer, sizeof(large_buffer)));
// expected-error@+1{{will always overflow}}