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

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

Merge "debuggerd_fallback: fix fd leak." am: e26b8b01 

am: ffd3922f

Change-Id: Ic08de0883c64d9cbf140831ffa683f485f355fd3
parents 8923ca7d ffd3922f

debuggerd/handler/debuggerd_fallback.cpp

+3 −2
Original line number Diff line number Diff line
@@ -250,11 +250,12 @@ static void trace_handler(siginfo_t* info, ucontext_t* ucontext) { 
        }



        uint64_t expected = pack_thread_fd(-1, -1);

        if (!trace_output.compare_exchange_strong(expected,

                                                  pack_thread_fd(tid, pipe_write.release()))) {

        int sent_fd = pipe_write.release();

        if (!trace_output.compare_exchange_strong(expected, pack_thread_fd(tid, sent_fd))) {

          auto [tid, fd] = unpack_thread_fd(expected);

          async_safe_format_log(ANDROID_LOG_ERROR, "libc",

                                "thread %d is already outputting to fd %d?", tid, fd);

          close(sent_fd);

          return false;

        }