commit e89e09dd2b9b42184973e3ade291186a2737bced
author Nick Kralevich <nnk@google.com> Tue Dec 10 10:18:10 2013 -0800
committer Nick Kralevich <nnk@google.com> Tue Dec 10 10:18:10 2013 -0800
tree 76b9e971108fe523b58bbdd9338df8a0c81a8ae4
parent 5dc5bfefa078f2aded34f85db4613ba91ad49b76

Fix overflow in adb_client

Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953

adb/adb_client.c

diff --git a/adb/adb_client.c b/adb/adb_client.c
index 9a812f0..89eb428 100644
--- a/adb/adb_client.c
+++ b/adb/adb_client.c
@@ -228,7 +228,7 @@
     } else {
         // if server was running, check its version to make sure it is not out of date
         char buf[100];
-        int n;
+        size_t n;
         int version = ADB_SERVER_VERSION - 1;
 
         // if we have a file descriptor, then parse version result
@@ -237,7 +237,7 @@
 
             buf[4] = 0;
             n = strtoul(buf, 0, 16);
-            if(n > (int)sizeof(buf)) goto error;
+            if(n > sizeof(buf)) goto error;
             if(readx(fd, buf, n)) goto error;
             adb_close(fd);