openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 5372333885)

Change-Id: I920c1de933ce5ba0a0d57eb8a9b557325a767a2a
This commit is contained in:
Alexander Ivchenko 2014-08-06 14:51:40 +04:00 committed by Elliott Hughes
parent 46a8ffe87f
commit 678bd2e822
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
adb/commandline.c
View File

@ -1746,9 +1746,10 @@ top:
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 @@ static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
}
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