summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich2013-12-10 12:18:10 -0600
committerNick Kralevich2013-12-10 12:18:10 -0600
commite89e09dd2b9b42184973e3ade291186a2737bced (patch)
tree76b9e971108fe523b58bbdd9338df8a0c81a8ae4
parent5dc5bfefa078f2aded34f85db4613ba91ad49b76 (diff)
downloadplatform-system-core-android-cts-4.1_r4.tar.gz
platform-system-core-android-cts-4.1_r4.tar.xz
platform-system-core-android-cts-4.1_r4.zip
Fix overflow in adb_clientandroid-cts-4.1_r4
Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037 Credit: Joshua Drake Bug: 12060953
-rw-r--r--adb/adb_client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/adb_client.c b/adb/adb_client.c
index 9a812f0cf..89eb42813 100644
--- a/adb/adb_client.c
+++ b/adb/adb_client.c
@@ -228,7 +228,7 @@ int adb_connect(const char *service)
228 } else { 228 } else {
229 // if server was running, check its version to make sure it is not out of date 229 // if server was running, check its version to make sure it is not out of date
230 char buf[100]; 230 char buf[100];
231 int n; 231 size_t n;
232 int version = ADB_SERVER_VERSION - 1; 232 int version = ADB_SERVER_VERSION - 1;
233 233
234 // if we have a file descriptor, then parse version result 234 // if we have a file descriptor, then parse version result
@@ -237,7 +237,7 @@ int adb_connect(const char *service)
237 237
238 buf[4] = 0; 238 buf[4] = 0;
239 n = strtoul(buf, 0, 16); 239 n = strtoul(buf, 0, 16);
240 if(n > (int)sizeof(buf)) goto error; 240 if(n > sizeof(buf)) goto error;
241 if(readx(fd, buf, n)) goto error; 241 if(readx(fd, buf, n)) goto error;
242 adb_close(fd); 242 adb_close(fd);
243 243