summaryrefslogtreecommitdiffstats
path: root/install/install.cpp
diff options
context:
space:
mode:
authorKelvin Zhang <zhangkelvin@google.com>2020-09-21 12:03:58 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-21 12:03:58 +0200
commitaf5bb04a6fe99000c54e4613c2d6a4b4c4160c84 (patch)
treec5055a1cf28ac784e147903db5c50183c3295426 /install/install.cpp
parent[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461 am: d3865b7a63 -s ours am: c4eabe78c5 -s ours am: c00dfe5d95 -s ours am: 602f36a0a5 -s ours (diff)
parentMerge "Check for overflow before allocating memory fore decompression." am: c1d2c15785 am: 115a017218 am: 701b8d660d am: a5c4d3c016 (diff)
downloadandroid_bootable_recovery-af5bb04a6fe99000c54e4613c2d6a4b4c4160c84.tar
android_bootable_recovery-af5bb04a6fe99000c54e4613c2d6a4b4c4160c84.tar.gz
android_bootable_recovery-af5bb04a6fe99000c54e4613c2d6a4b4c4160c84.tar.bz2
android_bootable_recovery-af5bb04a6fe99000c54e4613c2d6a4b4c4160c84.tar.lz
android_bootable_recovery-af5bb04a6fe99000c54e4613c2d6a4b4c4160c84.tar.xz
android_bootable_recovery-af5bb04a6fe99000c54e4613c2d6a4b4c4160c84.tar.zst
android_bootable_recovery-af5bb04a6fe99000c54e4613c2d6a4b4c4160c84.zip
Diffstat (limited to 'install/install.cpp')
-rw-r--r--install/install.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/install/install.cpp b/install/install.cpp
index 753373206..1b220cb39 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -246,7 +246,13 @@ bool SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int
LOG(ERROR) << "Failed to find " << AB_OTA_PAYLOAD_PROPERTIES;
return false;
}
- uint32_t properties_entry_length = properties_entry.uncompressed_length;
+ auto properties_entry_length = properties_entry.uncompressed_length;
+ if (properties_entry_length > std::numeric_limits<size_t>::max()) {
+ LOG(ERROR) << "Failed to extract " << AB_OTA_PAYLOAD_PROPERTIES
+ << " because's uncompressed size exceeds size of address space. "
+ << properties_entry_length;
+ return false;
+ }
std::vector<uint8_t> payload_properties(properties_entry_length);
int32_t err =
ExtractToMemory(zip, &properties_entry, payload_properties.data(), properties_entry_length);