commit 23f40e4393cbaab528dcb297e604849907494442
author Zach Riggle <riggle@google.com> Thu Apr 14 17:18:04 2016 -0400
committer Elliott Hughes <enh@google.com> Fri Apr 22 08:08:01 2016 -0700
tree de71e565c197cf4930783484b6c029c0faf60527
parent 6c75f2f223b2d3e3d3faf75f6750b27aeaca66b1

Fix NULL deref on exec-in with insufficient arguments

(cherry-pick of 566a28169b84836fddd5ae96db9b147237ea054f.)

Bug: 28152091
Change-Id: Ib59e3bf7f26974aa09d2e6a0e1d9281d7ce25511

adb/commandline.cpp

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;