Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd2c26a8 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "debuggerd: fix CrasherTest.seccomp_crash_oom." am: 74bf8144 am: 10537510 

am: dfb5b4b1

Change-Id: I756a13e55bf70218e169df9b131b8de8a8e7b2ce
parents 26c97b2c dfb5b4b1

debuggerd/handler/debuggerd_fallback.cpp

+10 −1
Original line number Diff line number Diff line
@@ -304,7 +304,16 @@ static void crash_handler(siginfo_t* info, ucontext_t* ucontext, void* abort_mes 


  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);

  }