commit c39f77fd46c268605e270228b24d2753d2c95f21
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 13 14:46:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 13 14:46:50 2019 +0000
tree 1d3efd2bcd316d53892cf67ac8debe3f89af2080
parent c4e085dbb2c7230af6ef35eff41961179967f616
parent 55889a94313d8a806adaeceb9dc774db6762798e

Merge "Fix crash when recreating producer."

src/profiling/memory/heapprofd_producer.cc

diff --git a/src/profiling/memory/heapprofd_producer.cc b/src/profiling/memory/heapprofd_producer.cc
index d6fdc10..434d3cc 100644
--- a/src/profiling/memory/heapprofd_producer.cc
+++ b/src/profiling/memory/heapprofd_producer.cc
@@ -75,6 +75,11 @@
     task_runner.Quit();
   for (std::thread& th : unwinding_threads_)
     th.join();
+  // We only borrowed this from the environment variable.
+  // UnixSocket always owns the socket, so we need to manually release it
+  // here.
+  if (mode_ == HeapprofdMode::kCentral)
+    listening_socket_->ReleaseSocket().ReleaseFd().release();
 }
 
 void HeapprofdProducer::SetTargetProcess(pid_t target_pid,