ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix NULL deref on exec-in with insufficient arguments"

Browse source 
am: 245e4dbfd4

* commit '245e4dbfd459f63bad100b09bd58e3931924e16f':
  Fix NULL deref on exec-in with insufficient arguments

Change-Id: I386257b6c30c4f02e161e2b0a827e73eca9d229e
This commit is contained in:
Zach Riggle 2016-04-22 15:51:38 +00:00 • committed by android-build-merger
commit a0690543da
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/commandline.cpp
View file

@ -1613,6 +1613,11 @@ int adb_commandline(int argc, const char **argv) {
else if (!strcmp(argv[0], "exec-in") || !strcmp(argv[0], "exec-out")) { else if (!strcmp(argv[0], "exec-in") || !strcmp(argv[0], "exec-out")) {
int exec_in = !strcmp(argv[0], "exec-in"); int exec_in = !strcmp(argv[0], "exec-in");
if (argc < 2) {
fprintf(stderr, "Usage: adb %s command\n", argv[0]);
return 1;
}
std::string cmd = "exec:"; std::string cmd = "exec:";
cmd += argv[1]; cmd += argv[1];
argc -= 2; argc -= 2;