commit f9f0b5f41351990968065020a67445d20b93616c
author Zach Riggle <riggle@google.com> Fri Apr 22 15:53:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 22 15:53:55 2016 +0000
tree 59e22f4f3aedeec6054c014210d02420a589836a
parent c25bd561ae4cfb0e517501f17ffad2158cdc8631
parent a0690543dac2792508caef09e9e97804b31fea24

Merge "Fix NULL deref on exec-in with insufficient arguments" am: 245e4dbfd4
am: a0690543da

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

Change-Id: Ic5e62d01fecc77aace676bf6cdf4218f93806860

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 0c5be84..b18d574 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1656,6 +1656,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;