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

Commit 74bf8144 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "debuggerd: fix CrasherTest.seccomp_crash_oom."

parents 98214c81 d2b15dd6

debuggerd/handler/debuggerd_fallback.cpp

+10 −1
Original line number Original line 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();

  crash_mutex.lock();

  if (lock_count++ > 0) {

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

    _exit(1);

  }

  }