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

Commit bb89e7e6 authored by Yabin Cui's avatar Yabin Cui Committed by android-build-merger
Browse files

Merge "adb: check return value of register_socket_transport." am: 3d981c87 

am: 1a78ec8f

* commit '1a78ec8f':
  adb: check return value of register_socket_transport.

Change-Id: I94be64825d5908d52d930125808f431fd6b96503
parents bf3c130c 1a78ec8f

adb/transport_local.cpp

+5 −3
Original line number Diff line number Diff line
@@ -172,7 +172,9 @@ static void server_socket_thread(void* arg) { 
            D("server: new connection on fd %d", fd);

            close_on_exec(fd);

            disable_tcp_nagle(fd);

            register_socket_transport(fd, "host", port, 1);

            if (register_socket_transport(fd, "host", port, 1) != 0) {

                adb_close(fd);

            }

        }

    }

    D("transport: server_socket_thread() exiting");
@@ -266,8 +268,8 @@ static void qemu_socket_thread(void* arg) { 
                /* Host is connected. Register the transport, and start the

                 * exchange. */

                std::string serial = android::base::StringPrintf("host-%d", fd);

                register_socket_transport(fd, serial.c_str(), port, 1);

                if (!WriteFdExactly(fd, _start_req, strlen(_start_req))) {

                if (register_socket_transport(fd, serial.c_str(), port, 1) != 0 ||

                    !WriteFdExactly(fd, _start_req, strlen(_start_req))) {

                    adb_close(fd);

                }

            }