commit 914f39d2d35fa58ad83103e1005637f2a34615d3
author Tianjie Xu <xunchang@google.com> Tue Sep 13 22:45:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 13 22:45:34 2016 +0000
tree 3251273048cdcdd6ff499ab22c8862c771bfa4fe
parent 7a97733f7ac3851214747d71c7d713e42f02e1e6
parent 41a3fd4e202168fc58f9955f7bcac43121f55fc5

Check corruption when reading uncrypt_status file
am: 41a3fd4e20

Change-Id: I19d9b6605d75d636eef0c770979b9f71c2e6a7f2

install.cpp

diff --git a/install.cpp b/install.cpp
index 9227d58..209300e 100644
--- a/install.cpp
+++ b/install.cpp
@@ -548,6 +548,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());
             }