ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 1a78ec8f65

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

Change-Id: I94be64825d5908d52d930125808f431fd6b96503
This commit is contained in:
Yabin Cui 2016-05-21 01:27:05 +00:00 • committed by android-build-merger
commit bb89e7e6b5
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/transport_local.cpp
View file

@ -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);
}
}