Merge "Check corruption when reading uncrypt_status file"

am: 3cf815a6a9 Change-Id: Ic7404abd3026a8faffaac14a20c90ebf2ef10106
2016-09-13 22:26:03 +00:00
parent 6048138e10 3cf815a6a9
commit 40bae5e1c6
1 changed files with 2 additions and 0 deletions
--- a/install.cpp
+++ b/install.cpp
@@ -392,6 +392,8 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
            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());
            }