commit a821d50bd43809414521590ebe65601b823f8095
author JP Abgrall <jpa@google.com> Thu Mar 13 15:54:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 13 15:54:36 2014 +0000
tree 39631ae4c52a2fc5124c2a010a73f453ef1a4b06
parent 15c3e01e05359fb11ce5e63934d7c3d54d0d6e93
parent 470f0b3ff46493b4a46b3599db33a29e94615d30

am 470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""

* commit '470f0b3ff46493b4a46b3599db33a29e94615d30':
  Avoid segv by checking argc in "storage user <mountpoint>"

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index ea18c1d..c8d6848 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -242,6 +242,10 @@
         DIR *dir;
         struct dirent *de;
 
+        if (argc < 3) {
+            cli->sendMsg(ResponseCode::CommandSyntaxError, "Missing Argument: user <mountpoint>", false);
+            return 0;
+        }
         if (!(dir = opendir("/proc"))) {
             cli->sendMsg(ResponseCode::OperationFailed, "Failed to open /proc", true);
             return 0;