commit 9bdc70d0f4b0b551eaf6d2d89c3ee8faafc70ca2
author Alexander Ivchenko <alexander.ivchenko@intel.com> Wed Aug 06 14:51:40 2014 +0400
committer Elliott Hughes <enh@google.com> Wed Aug 06 10:59:53 2014 -0700
tree cdf4e78d570e4bce4a27e71c120159cb1ad4e61e
parent 529fca860d10807fb864e82772e9fa9da25a49d1

Fix build of adb with gcc-4.9.

Without this patch we get:

system/core/adb/commandline.c:1629:16: error: array subscript is above
array bounds [-Werror=array-bounds]

Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>

(cherry picked from commit 53723338858772a0189aa3f92f4d4bbdaa9b6772)

Change-Id: I920c1de933ce5ba0a0d57eb8a9b557325a767a2a

commandline.c

diff --git a/commandline.c b/commandline.c
index 2df3f09..b268ca5 100644
--- a/commandline.c
+++ b/commandline.c
@@ -1746,9 +1746,10 @@
     return 1;
 }
 
+#define MAX_ARGV_LENGTH 16
 static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
 {
-    char *argv[16];
+    char *argv[MAX_ARGV_LENGTH];
     int argc;
     va_list ap;
 
@@ -1765,7 +1766,9 @@
     }
 
     argv[argc++] = cmd;
-    while((argv[argc] = va_arg(ap, char*)) != 0) argc++;
+    while(argc < MAX_ARGV_LENGTH &&
+        (argv[argc] = va_arg(ap, char*)) != 0) argc++;
+    assert(argc < MAX_ARGV_LENGTH);
     va_end(ap);
 
 #if 0