commit 3cf815a6a93bd9e27d250d181ef877e5d3a42018
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 13 22:20:03 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 13 22:20:04 2016 +0000
tree a7dd9ec0e0fe5a81eb6077b42a2db1e71b54c659
parent cdf509cce2d6a2f42ea5a8abb3c1e42532853e42
parent 1c1864f321b129c81883ed527b1da8c69661e51f

Merge "Check corruption when reading uncrypt_status file"

install.cpp

diff --git a/install.cpp b/install.cpp
index fac6151..4c69742 100644
--- a/install.cpp
+++ b/install.cpp
@@ -392,6 +392,8 @@
             std::string uncrypt_status;
             if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
                 PLOG(WARNING) << "failed to read uncrypt status";
+            } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_time:")) {
+                PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
             } else {
                 fprintf(install_log, "%s\n", android::base::Trim(uncrypt_status).c_str());
             }