commit 6380bf4e7fd6a6c79f81c3df053ec745dcd8feed
author Paul Lawrence <paullawrence@google.com> Tue Dec 02 18:45:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 02 18:45:42 2014 +0000
tree 83cc5cfb7b8827485464facc6cc70978ce4259e5
parent c9c51717923315edf1d14bdeb3e06036107a3be0
parent b25302e1b0232ac2f9d6ffa441f2ab1ff23a2de3

am b25302e1: Do not log passwords returned through vdc

* commit 'b25302e1b0232ac2f9d6ffa441f2ab1ff23a2de3':
  Do not log passwords returned through vdc

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index 4c65959..f135a01 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -710,8 +710,14 @@
         dumpArgs(argc, argv, -1);
         char* password = cryptfs_get_password();
         if (password) {
-            cli->sendMsg(ResponseCode::CommandOkay, password, false);
-            return 0;
+            char* message = 0;
+            int size = asprintf(&message, "{{sensitive}} %s", password);
+            if (size != -1) {
+                cli->sendMsg(ResponseCode::CommandOkay, message, false);
+                memset(message, 0, size);
+                free (message);
+                return 0;
+            }
         }
         rc = -1;
     } else if (!strcmp(argv[1], "clearpw")) {