commit 03d4eb29003a712c28733646588fafc8939fc1fe
author Nick Kralevich <nnk@google.com> Tue Dec 10 12:17:45 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 10 12:17:45 2013 -0800
tree fc80cce6eecb8de305fa6dbdfc2907ca06d961d9
parent 92b2cd23f708c9aeed146e995807dce080b57d1a
parent d63fb078aea697c536b19c03d29d4dde4ac087fc

am d63fb078: am e89e09dd: Fix overflow in adb_client

* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
  Fix overflow in adb_client

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