commit 1d55666106f80ae0824ac284f82d90899575358c
author Tianjie Xu <xunchang@google.com> Tue Sep 13 22:28:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 13 22:28:32 2016 +0000
tree 5594ed8d21addb3bb08d004bc6f1814f33bd765d
parent 86ea1724ae85e54ae037777d788ce4713804754f
parent 40bae5e1c63a7fe7cd3b64b1d13c1bbb6f18b84a

Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9
am: 40bae5e1c6

Change-Id: I098148f53065e7420e500db66f1ada0d0730a0d6

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());
             }