commit df7382e477ed0e3d27dc7cb1ca029aa52b476c7c
author JP Abgrall <jpa@google.com> Wed Mar 12 20:35:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 12 20:35:03 2014 +0000
tree 0456b863b4795851ba141af549e4e6fd90182f26
parent 1d87676b8244bc2683576f139efa98d4b536e7dc
parent a29997ae260d3d7cf41c40d9c7ba42b761b12d30

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

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

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index 3a327f1..562b5c2 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -240,6 +240,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;