commit e772705a598a8d2a13fb9d8386d06441b67f804f
author Elliott Hughes <enh@google.com> Wed Aug 06 18:06:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 06 18:06:33 2014 +0000
tree 42b51b3116844de5ee98dd98e1299c811a864899
parent 8a01917da13ba9ed66a8dd2adec33aaf38845c00
parent 771f6f299f16704b251d6adb8fb185c8fb517d07

am 771f6f29: am 29c5a78f: Merge "Fix build of adb with gcc-4.9."

* commit '771f6f299f16704b251d6adb8fb185c8fb517d07':
  Fix build of adb with gcc-4.9.

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index 2df3f09..b268ca5 100644
--- a/adb/commandline.c
+++ b/adb/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