diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2020-09-17 17:32:29 +0200 |
---|---|---|
committer | Kelvin Zhang <zhangkelvin@google.com> | 2020-09-18 23:41:51 +0200 |
commit | d1ba38f7c96e74901779089fea6d09b0c7c2521d (patch) | |
tree | f892e9ca467b4f751345a2a3200caf8903a217c9 /updater/updater.cpp | |
parent | Merge "Switch to zip64 in recovery" (diff) | |
download | android_bootable_recovery-d1ba38f7c96e74901779089fea6d09b0c7c2521d.tar android_bootable_recovery-d1ba38f7c96e74901779089fea6d09b0c7c2521d.tar.gz android_bootable_recovery-d1ba38f7c96e74901779089fea6d09b0c7c2521d.tar.bz2 android_bootable_recovery-d1ba38f7c96e74901779089fea6d09b0c7c2521d.tar.lz android_bootable_recovery-d1ba38f7c96e74901779089fea6d09b0c7c2521d.tar.xz android_bootable_recovery-d1ba38f7c96e74901779089fea6d09b0c7c2521d.tar.zst android_bootable_recovery-d1ba38f7c96e74901779089fea6d09b0c7c2521d.zip |
Diffstat (limited to '')
-rw-r--r-- | updater/updater.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/updater/updater.cpp b/updater/updater.cpp index 73ca0e532..c52673462 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -170,7 +170,12 @@ bool Updater::ReadEntryToString(ZipArchiveHandle za, const std::string& entry_na << " in the package: " << ErrorCodeString(find_err); return false; } - + if (entry.uncompressed_length > std::numeric_limits<size_t>::max()) { + LOG(ERROR) << "Failed to extract " << entry_name + << " because's uncompressed size exceeds size of address space. " + << entry.uncompressed_length; + return false; + } content->resize(entry.uncompressed_length); int extract_err = ExtractToMemory(za, &entry, reinterpret_cast<uint8_t*>(&content->at(0)), entry.uncompressed_length); |