diff options
| author | Nick Kralevich <nnk@google.com> | 2013-12-10 12:20:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-10 12:20:08 -0800 |
| commit | e975716e36c9ad6aa80be2b54ee2cc63eadbdc44 (patch) | |
| tree | e6959aaf539db5b88786ec89013b080a6cb4f6a6 | |
| parent | 09b43645514669b3ff8181b0a111bc14576e3699 (diff) | |
| parent | 03d4eb29003a712c28733646588fafc8939fc1fe (diff) | |
| download | system_core-e975716e36c9ad6aa80be2b54ee2cc63eadbdc44.zip system_core-e975716e36c9ad6aa80be2b54ee2cc63eadbdc44.tar.gz system_core-e975716e36c9ad6aa80be2b54ee2cc63eadbdc44.tar.bz2 | |
am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '03d4eb29003a712c28733646588fafc8939fc1fe':
Fix overflow in adb_client
| -rw-r--r-- | adb/adb_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ int adb_connect(const char *service) } 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 @@ int adb_connect(const char *service) 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); |