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 /install/install.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 'install/install.cpp')
-rw-r--r-- | install/install.cpp | 8 |
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); |