openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 5abd3d0b: Merge "adbd: tcpip command uses port number from uninitialized memory" 

* commit '5abd3d0b79d4f4690058f9d70bf723ebaa99616e':
  adbd: tcpip command uses port number from uninitialized memory
This commit is contained in:
Mike Lockwood 2015-01-26 19:17:14 +00:00 committed by Android Git Automerger
parent 7e890a4d32 5abd3d0b79
commit c8cc8ea221
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adb/services.c
View File

@ -455,7 +455,7 @@ int service_to_fd(const char *name)
ret = create_subproc_thread("/system/bin/bu restore", SUBPROC_RAW);
} else if(!strncmp(name, "tcpip:", 6)) {
int port;
if (sscanf(name + 6, "%d", &port) == 0) {
if (sscanf(name + 6, "%d", &port) != 1) {
port = 0;
}
ret = create_service_thread(restart_tcp_service, (void *) (uintptr_t) port);
@ -527,7 +527,7 @@ static void connect_device(char* host, char* buffer, int buffer_size)
}
// zero terminate the host at the point we found the colon
hostbuf[portstr - host] = 0;
if (sscanf(portstr + 1, "%d", &port) == 0) {
if (sscanf(portstr + 1, "%d", &port) != 1) {
snprintf(buffer, buffer_size, "bad port number %s", portstr);
return;
}