commit d467179eb66277f18824589e4ed8c1d1d6f4b199
author Tianjie Xu <xunchang@google.com> Tue Sep 13 22:55:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 13 22:55:45 2016 +0000
tree fc1ee2d19010c157ef7136d45f1b6f3e6eb6d22c
parent 7010bf13f329cea269de9da0d5c60c56273b48f9
parent 8dd5b2a2ccb0ac747e75846a3d909b1b0a88f5f3

Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 am: 1d55666106
am: 8dd5b2a2cc

Change-Id: I0e82c7d7e914055df504a5293aedd49db47d9d22

install.cpp

diff --git a/install.cpp b/install.cpp
index d8073c5..71ad71f 100644
--- a/install.cpp
+++ b/install.cpp
@@ -543,6 +543,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());
             }