commit 6bfb7b64ba857f78c0a0bcb08591003655df2b7e
author Nick Kralevich <nnk@google.com> Mon Jan 27 22:26:13 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 22:26:13 2014 +0000
tree a9c9d5ad8ebe76f9f6dfb33c51434bbc318e2639
parent 39baa8296d39edfb25f5f2a4673f6a303e1245c5
parent 75e0645921cb6c3e9d33672733372f519bf57f38

Merge "Fix overflow in adb_client"

adb/adb_client.c

diff --git a/adb/adb_client.c b/adb/adb_client.c
index f7823a8..586cd7b 100644
--- a/adb/adb_client.c
+++ b/adb/adb_client.c
@@ -241,7 +241,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
@@ -250,7 +250,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);