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

am: 1d55666106 Change-Id: I2081d6803377a7bf26175a55b3b5defb7c9d09d1
2016-09-13 22:31:33 +00:00
parent b3d92f0cf6 1d55666106
commit 8dd5b2a2cc
1 changed files with 2 additions and 0 deletions
@@ -543,6 +543,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());
            }