commit 771f6f299f16704b251d6adb8fb185c8fb517d07
author Elliott Hughes <enh@google.com> Wed Aug 06 18:01:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 06 18:01:50 2014 +0000
tree 875d5a01f5b941616550d876ae510a06e8f0aca0
parent 830a8641bb960d208ad2a5b3bc3d9fb91bc31c2b
parent 29c5a78fdc163f7d5e5e3a00729b8c37a89562f6

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

* commit '29c5a78fdc163f7d5e5e3a00729b8c37a89562f6':
  Fix build of adb with gcc-4.9.

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index ccf158c..356c0db 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -1602,9 +1602,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;
 
@@ -1621,7 +1622,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