summaryrefslogtreecommitdiffstats
path: root/install/wipe_device.cpp
diff options
context:
space:
mode:
authorKelvin Zhang <zhangkelvin@google.com>2020-09-21 12:17:04 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-21 12:17:04 +0200
commit92b0be79f9c9df0d4107dea923d496b8a90ac18f (patch)
tree96e8884fee217ebe353922cc07425648bfc2e590 /install/wipe_device.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 am: 77ecaa6b06 -s ours (diff)
parentMerge "Check for overflow before allocating memory fore decompression." am: c1d2c15785 am: 115a017218 am: 701b8d660d am: a5c4d3c016 am: 6e970758e1 (diff)
downloadandroid_bootable_recovery-92b0be79f9c9df0d4107dea923d496b8a90ac18f.tar
android_bootable_recovery-92b0be79f9c9df0d4107dea923d496b8a90ac18f.tar.gz
android_bootable_recovery-92b0be79f9c9df0d4107dea923d496b8a90ac18f.tar.bz2
android_bootable_recovery-92b0be79f9c9df0d4107dea923d496b8a90ac18f.tar.lz
android_bootable_recovery-92b0be79f9c9df0d4107dea923d496b8a90ac18f.tar.xz
android_bootable_recovery-92b0be79f9c9df0d4107dea923d496b8a90ac18f.tar.zst
android_bootable_recovery-92b0be79f9c9df0d4107dea923d496b8a90ac18f.zip
Diffstat (limited to '')
-rw-r--r--install/wipe_device.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/install/wipe_device.cpp b/install/wipe_device.cpp
index 0f896c43b..915c87b45 100644
--- a/install/wipe_device.cpp
+++ b/install/wipe_device.cpp
@@ -51,7 +51,12 @@ std::vector<std::string> GetWipePartitionList(Package* wipe_package) {
std::string partition_list_content;
ZipEntry64 entry;
if (FindEntry(zip, RECOVERY_WIPE_ENTRY_NAME, &entry) == 0) {
- uint32_t length = entry.uncompressed_length;
+ auto length = entry.uncompressed_length;
+ if (length > std::numeric_limits<size_t>::max()) {
+ LOG(ERROR) << "Failed to extract " << RECOVERY_WIPE_ENTRY_NAME
+ << " because's uncompressed size exceeds size of address space. " << length;
+ return {};
+ }
partition_list_content = std::string(length, '\0');
if (auto err = ExtractToMemory(
zip, &entry, reinterpret_cast<uint8_t*>(partition_list_content.data()), length);