diff options
| author | Etienne Pierre-doray <etiennep@chromium.org> | 2021-10-28 21:16:04 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-10-28 14:31:23 -0700 |
| commit | b90a947429fdce96b1d684b9a7af9683cb4a13c1 (patch) | |
| tree | 333e034b74f5ec4cfb1be1600c4d1a061afbb3bc /patch_writer.cc | |
| parent | aff408603b3db5b7974c522db2ad8c5ce2a0f3c1 (diff) | |
| download | zucchini-b90a947429fdce96b1d684b9a7af9683cb4a13c1.tar.gz | |
[Zucchini]: Add patch version.
This is a breaking change to zucchini patch format:
Zucchini 1.0, see changelog.
Add major/minor patch-wide version, and element version.
Also add VerifyPatch() API and command line option to verify
patch compatibility.
Design: go/zucchini-versions
Bug: 1231882
Change-Id: I19f1fbe2ee866c23f0814ffe6a912fb72812edbc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3140224
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
Cr-Commit-Position: refs/heads/main@{#936096}
NOKEYCHECK=True
GitOrigin-RevId: 559d77a9741428a48add017d389d104e431e6de7
Diffstat (limited to 'patch_writer.cc')
| -rw-r--r-- | patch_writer.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/patch_writer.cc b/patch_writer.cc index 1206208..04f3244 100644 --- a/patch_writer.cc +++ b/patch_writer.cc @@ -10,6 +10,7 @@ #include "base/numerics/checked_math.h" #include "base/numerics/safe_conversions.h" #include "components/zucchini/crc32.h" +#include "components/zucchini/element_detection.h" namespace zucchini { @@ -30,6 +31,7 @@ bool SerializeElementMatch(const ElementMatch& element_match, element_header.new_length = base::checked_cast<uint32_t>(element_match.new_element.size); element_header.exe_type = element_match.exe_type(); + element_header.version = DisassemblerVersionOfType(element_match.exe_type()); return sink->PutValue<PatchElementHeader>(element_header); } @@ -248,11 +250,15 @@ EnsemblePatchWriter::~EnsemblePatchWriter() = default; EnsemblePatchWriter::EnsemblePatchWriter(const PatchHeader& header) : header_(header) { DCHECK_EQ(header_.magic, PatchHeader::kMagic); + DCHECK_EQ(header_.major_version, kMajorVersion); + DCHECK_EQ(header_.minor_version, kMinorVersion); } EnsemblePatchWriter::EnsemblePatchWriter(ConstBufferView old_image, ConstBufferView new_image) { header_.magic = PatchHeader::kMagic; + header_.major_version = kMajorVersion; + header_.minor_version = kMinorVersion; header_.old_size = base::checked_cast<uint32_t>(old_image.size()); header_.old_crc = CalculateCrc32(old_image.begin(), old_image.end()); header_.new_size = base::checked_cast<uint32_t>(new_image.size()); |