ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "debuggerd_fallback: fix fd leak."

Browse source
This commit is contained in:
Treehugger Robot 2018-10-31 06:05:28 +00:00 • committed by Gerrit Code Review
commit e26b8b0181
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debuggerd/handler/debuggerd_fallback.cpp
View file

@ -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;
}