diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp index 895c111e3..4d60ddbf7 100644 --- a/debuggerd/debuggerd_test.cpp +++ b/debuggerd/debuggerd_test.cpp @@ -1680,6 +1680,24 @@ TEST_P(GwpAsanCrasherTest, DISABLED_run_gwp_asan_test) { if (params.free_before_access) free(static_cast(const_cast(p))); p[params.access_offset] = 42; if (!params.free_before_access) free(static_cast(const_cast(p))); + + bool recoverable = std::get<1>(GetParam()); + ASSERT_TRUE(recoverable); // Non-recoverable should have crashed. + + // As we're in recoverable mode, trigger another 2x use-after-frees (ensuring + // we end with at least one in a different slot), make sure the process still + // doesn't crash. + p = reinterpret_cast(malloc(params.alloc_size)); + char* volatile p2 = reinterpret_cast(malloc(params.alloc_size)); + free(static_cast(const_cast(p))); + free(static_cast(const_cast(p2))); + *p = 42; + *p2 = 42; + + // Under clang coverage (which is a default TEST_MAPPING presubmit target), the + // recoverable+seccomp tests fail because the minijail prevents some atexit syscalls that clang + // coverage does. Thus, skip the atexit handlers. + _exit(0); } TEST_F(CrasherTest, fdsan_warning_abort_message) {