File fix-overflow-in-adb_client.patch of Package android-tools

Overview Repositories Revisions Requests Users Attributes Meta

File fix-overflow-in-adb_client.patch of Package android-tools

From 75e0645921cb6c3e9d33672733372f519bf57f38 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Tue, 10 Dec 2013 10:18:10 -0800
Subject: [PATCH] Fix overflow in adb_client

Credit: Joshua Drake
Bug: 12060953

(cherry picked from commit e89e09dd2b9b42184973e3ade291186a2737bced)

Change-Id: I8a9b2592a5e4f7527c607abfe4ea6df6eb550aa8
---
 adb/adb_client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ 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
@@ -250,7 +250,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);
 
-- 
1.8.4.5

Places

File fix-overflow-in-adb_client.patch of Package android-tools

Places