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

Commit fcb063ce 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
parent afa76a30

adb/shell_service.cpp

+3 −1
Original line number Diff line number Diff line
@@ -315,7 +315,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",