From 41a3fd4e202168fc58f9955f7bcac43121f55fc5 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Mon, 12 Sep 2016 16:43:37 -0700 Subject: Check corruption when reading uncrypt_status file Bug: 31383361 Change-Id: I0de920916da213528d73b742e4823b4a98c63ea1 (cherry picked from commit 1c1864f321b129c81883ed527b1da8c69661e51f) --- install.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.cpp b/install.cpp index 9227d5895..209300e89 100644 --- a/install.cpp +++ b/install.cpp @@ -548,6 +548,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()); } -- cgit v1.2.3