diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:56:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:56:43 +0000 |
commit | 8be98142ecdba40b2ea9be10b11a23f4e6b67b05 (patch) | |
tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /patch_reader.cc | |
parent | b77318bc7ecfba25e4966b56b9e9ab593925ad9d (diff) | |
parent | 7be427590935bc88198d32004449ccfcf60b60d4 (diff) | |
download | zucchini-8be98142ecdba40b2ea9be10b11a23f4e6b67b05.tar.gz |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58 am: 58b4d19a6b am: 7be4275909
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: Ifdb1f7882cc237258a3395d28158d50bb4b43136
Diffstat (limited to 'patch_reader.cc')
-rw-r--r-- | patch_reader.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/patch_reader.cc b/patch_reader.cc index 99951da..8fd9b57 100644 --- a/patch_reader.cc +++ b/patch_reader.cc @@ -10,6 +10,7 @@ #include "base/numerics/safe_conversions.h" #include "components/zucchini/algorithm.h" #include "components/zucchini/crc32.h" +#include "components/zucchini/element_detection.h" namespace zucchini { @@ -27,6 +28,12 @@ bool ParseElementMatch(BufferSource* source, ElementMatch* element_match) { LOG(ERROR) << "Invalid ExecutableType found."; return false; } + uint16_t element_version = DisassemblerVersionOfType(exe_type); + if (element_version != unsafe_element_header.version) { + LOG(ERROR) << "Element version doesn't match. Expected: " << element_version + << ", Actual:" << unsafe_element_header.version; + return false; + } if (!unsafe_element_header.old_length || !unsafe_element_header.new_length) { LOG(ERROR) << "Empty patch element found."; return false; @@ -334,6 +341,11 @@ bool EnsemblePatchReader::Initialize(BufferSource* source) { LOG(ERROR) << "Patch contains invalid magic."; return false; } + if (header_.major_version != kMajorVersion) { + LOG(ERROR) << "Patch major version doesn't match. Expected: " + << kMajorVersion << ", Actual:" << header_.major_version; + return false; + } // |header_| is assumed to be safe from this point forward. uint32_t element_count = 0; |