summaryrefslogtreecommitdiffstats
path: root/updater/target_files.cpp
diff options
context:
space:
mode:
authorKelvin Zhang <zhangkelvin@google.com>2020-09-19 08:16:32 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-19 08:16:32 +0200
commit701b8d660d2851ae8aa64386b92acac09be065b9 (patch)
tree6a1b77b1e1a62e27ea23f0940266b7557dec8382 /updater/target_files.cpp
parent[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461 am: d3865b7a63 -s ours (diff)
parentMerge "Check for overflow before allocating memory fore decompression." am: c1d2c15785 (diff)
downloadandroid_bootable_recovery-701b8d660d2851ae8aa64386b92acac09be065b9.tar
android_bootable_recovery-701b8d660d2851ae8aa64386b92acac09be065b9.tar.gz
android_bootable_recovery-701b8d660d2851ae8aa64386b92acac09be065b9.tar.bz2
android_bootable_recovery-701b8d660d2851ae8aa64386b92acac09be065b9.tar.lz
android_bootable_recovery-701b8d660d2851ae8aa64386b92acac09be065b9.tar.xz
android_bootable_recovery-701b8d660d2851ae8aa64386b92acac09be065b9.tar.zst
android_bootable_recovery-701b8d660d2851ae8aa64386b92acac09be065b9.zip
Diffstat (limited to 'updater/target_files.cpp')
-rw-r--r--updater/target_files.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/updater/target_files.cpp b/updater/target_files.cpp
index 951923293..207146f52 100644
--- a/updater/target_files.cpp
+++ b/updater/target_files.cpp
@@ -137,6 +137,13 @@ bool TargetFile::ReadEntryToString(const std::string_view name, std::string* con
return true;
}
+ if (entry.uncompressed_length > std::numeric_limits<size_t>::max()) {
+ LOG(ERROR) << "Failed to extract " << name
+ << " because's uncompressed size exceeds size of address space. "
+ << entry.uncompressed_length;
+ return false;
+ }
+
content->resize(entry.uncompressed_length);
if (auto extract_err = ExtractToMemory(
handle_, &entry, reinterpret_cast<uint8_t*>(&content->at(0)), entry.uncompressed_length);