Merge "Fix NULL deref on exec-in with insufficient arguments"
am: 245e4dbfd4
* commit '245e4dbfd459f63bad100b09bd58e3931924e16f':
Fix NULL deref on exec-in with insufficient arguments
Change-Id: I386257b6c30c4f02e161e2b0a827e73eca9d229e
diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index d8b1654..45c6142 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1613,6 +1613,11 @@
else if (!strcmp(argv[0], "exec-in") || !strcmp(argv[0], "exec-out")) {
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:";
cmd += argv[1];
argc -= 2;