commit 8dd5b2a2ccb0ac747e75846a3d909b1b0a88f5f3
author Tianjie Xu <xunchang@google.com> Tue Sep 13 22:31:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 13 22:31:33 2016 +0000
tree cb728a6b3003a26884aef8852a5a6c05dea03ea9
parent b3d92f0cf60aab2aae5090c123516dc3e9b19b4b
parent 1d55666106f80ae0824ac284f82d90899575358c

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

Change-Id: I2081d6803377a7bf26175a55b3b5defb7c9d09d1

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