commit 7a514540d79ff7ce67b90ec5d46bb1e90d6fdc12
author Josh Gao <jmgao@google.com> Sat Mar 05 03:04:36 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 05 03:04:37 2016 +0000
tree d9e9948bc2c2b8dd444d0b7c49c23f9557b8ba81
parent 07f7587ccb5299cd0966cad1183899c3873bfda6
parent a486880cd3f4be8d0f5a6b752f8336510fa771cf

Merge "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",