commit ea80a9fa92d2828f2e52d293551461d6663ecf07
author Josh Gao <jmgao@google.com> Fri May 18 19:19:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 18 19:19:49 2018 -0700
tree 488597ca33e147341685eb1165077c7c2c2cbced
parent 3e12b1085368bfd07dc784f900359e7d5eb10b6e
parent c12f72ce219410f1c3c7806f9e950c43f0b7f592

Merge "debuggerd: fix CrasherTest.seccomp_crash_oom."
am: 74bf81443f

Change-Id: I6fda76a0e7c0a5f699d590949dda3855fdb56128

debuggerd/handler/debuggerd_fallback.cpp

diff --git a/debuggerd/handler/debuggerd_fallback.cpp b/debuggerd/handler/debuggerd_fallback.cpp
index dea2e17..079a574 100644
--- a/debuggerd/handler/debuggerd_fallback.cpp
+++ b/debuggerd/handler/debuggerd_fallback.cpp
@@ -304,7 +304,16 @@
 
   crash_mutex.lock();
   if (lock_count++ > 0) {
-    async_safe_format_log(ANDROID_LOG_ERROR, "libc", "recursed signal handler call, exiting");
+    async_safe_format_log(ANDROID_LOG_ERROR, "libc", "recursed signal handler call, aborting");
+    signal(SIGABRT, SIG_DFL);
+    raise(SIGABRT);
+    sigset_t sigset;
+    sigemptyset(&sigset);
+    sigaddset(&sigset, SIGABRT);
+    sigprocmask(SIG_UNBLOCK, &sigset, nullptr);
+
+    // Just in case...
+    async_safe_format_log(ANDROID_LOG_ERROR, "libc", "abort didn't exit, exiting");
     _exit(1);
   }