Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8238dd84 authored by Josh Gao's avatar Josh Gao
Browse files

adbd: fix spurious close of uninitialized fd.

forkpty only returns an fd on the master side; trying to keep track of
it on both sides is incorrect.

Bug: http://b/27504427
Change-Id: Ia4a454d8490c77738f9c3350a4236b3d99c8758b
(cherry picked from commit fcb063ce)
parent 5767d0dd
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -284,7 +284,9 @@ bool Subprocess::ForkAndExec(std::string* error) {
    if (type_ == SubprocessType::kPty) {
        int fd;
        pid_ = forkpty(&fd, pts_name, nullptr, nullptr);
        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",