commit da0678946c771f0cae418f866cbb9d2f0b2a4276
author Josh Gao <jmgao@google.com> Wed Jan 20 20:50:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 20 20:50:50 2016 +0000
tree a94f97383a60e7cc073a70a18ea79997a1ffcf03
parent 5828fe2f956aba75be6bb670385478497b4476fa
parent fb494eb40da4361b27c838480c7d7dcb86871331

Merge "adbd: don\'t leave zombies when subprocess creation fails."
am: fb494eb40d

* commit 'fb494eb40da4361b27c838480c7d7dcb86871331':
  adbd: don't leave zombies when subprocess creation fails.

adb/fdevent.cpp

diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp
index 25e8376..386f221 100644
--- a/adb/fdevent.cpp
+++ b/adb/fdevent.cpp
@@ -306,12 +306,14 @@
         auto it = g_poll_node_map.find(subproc_fd);
         if (it == g_poll_node_map.end()) {
             D("subproc_fd %d cleared from fd_table", subproc_fd);
+            adb_close(subproc_fd);
             return;
         }
         fdevent* subproc_fde = it->second.fde;
         if(subproc_fde->fd != subproc_fd) {
             // Already reallocated?
-            D("subproc_fd(%d) != subproc_fde->fd(%d)", subproc_fd, subproc_fde->fd);
+            LOG(FATAL) << "subproc_fd(" << subproc_fd << ") != subproc_fde->fd(" << subproc_fde->fd
+                       << ")";
             return;
         }
 

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 366ed07..95dff11 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -233,6 +233,7 @@
 }
 
 Subprocess::~Subprocess() {
+    WaitForExit();
 }
 
 bool Subprocess::ForkAndExec() {
@@ -432,7 +433,6 @@
             "shell srvc %d", subprocess->local_socket_fd()));
 
     subprocess->PassDataStreams();
-    subprocess->WaitForExit();
 
     D("deleting Subprocess for PID %d", subprocess->pid());
     delete subprocess;