commit f5b960538f95c5b42f97595bc1325fffa0e591f1
author Josh Gao <jmgao@google.com> Sat Mar 05 03:10:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 05 03:10:35 2016 +0000
tree 4ead9a6c1d540d97c7fc9c05accab567fb631f39
parent e5497e14a5dbba00ca719e7b74664a6a38b7145c
parent 97b9935fba43cfa892ef4ae2792a68c276b6f128

Merge "adbd: fix spurious close of uninitialized fd." am: 3c608c7425
am: 97b9935fba

* commit '97b9935fba43cfa892ef4ae2792a68c276b6f128':
  adbd: fix spurious close of uninitialized fd.

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index f84447f..8ece28c 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -315,7 +315,9 @@
     if (type_ == SubprocessType::kPty) {
         int fd;
         pid_ = forkpty(&fd, pts_name, nullptr, nullptr);
-        stdinout_sfd_.Reset(fd);
+        if (pid_ > 0) {
+          stdinout_sfd_.Reset(fd);
+        }
     } else {
         if (!CreateSocketpair(&stdinout_sfd_, &child_stdinout_sfd)) {
             *error = android::base::StringPrintf("failed to create socketpair for stdin/out: %s",