diff options
author | Samuel Huang <huangs@chromium.org> | 2018-06-21 15:50:22 +0000 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2021-07-25 19:59:48 -0700 |
commit | f35146e48edca6755e98749a2cb5cc00272d308b (patch) | |
tree | 62e88698cbb4f79fea0f7b10326961b0f665e0a8 /fuzzers | |
parent | 87dabe1110568bd11cd9044b1c5c49ab598bc2ad (diff) | |
download | zucchini-f35146e48edca6755e98749a2cb5cc00272d308b.tar.gz |
[Zucchini] Refactor Zucchini-gen in zucchini_io layer.
This CL moves Zucchini-gen invocation code from zucchini_commands.cc
(in target zucchini) to zucchini_integration.cc (in target zucchini_io)
to clean up layering in Zucchini API, i.e.:
- zucchini_lib: Operates on buffers only.
- zucchini_io: Adds files interface, uses memory-mapped I/O.
- zucchini: Stand-alone executable that parses command-line arguments.
Other changes:
- Rename zucchini_lib functions (zuchcini.h), to dedup names and
emphasize that these functions operate on buffers:
- GenerateEnsemble() -> GenerateBuffer(),
- GenerateEnsembleWithImposedMatches() -> GenerateBufferImposed(),
- GenerateRaw() -> GenerateBufferRaw(),
- Apply() -> ApplyBuffer().
These renames only affect Zucchini and various tests.
- Variable renames and parameter reordering in zucchini_integration.cc.
- Remove '-dd' param in help text of Zucchini-detect (was never ported
from Trunk, and has been recently deleted there as well).
- Replace all base::File&& with base::File.
- Miscellaneous cleanup for header include.
- Update README.md.
Change-Id: I835b80d4d3d7b291fa822a7a89dab225bf9171e9
Reviewed-on: https://chromium-review.googlesource.com/1105625
Reviewed-by: Samuel Huang <huangs@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569274}
NOKEYCHECK=True
GitOrigin-RevId: 9f0f325d6e2595deb8d50c77e0464946f3bf1ec1
Diffstat (limited to 'fuzzers')
-rw-r--r-- | fuzzers/apply_fuzzer.cc | 2 | ||||
-rw-r--r-- | fuzzers/raw_gen_fuzzer.cc | 2 | ||||
-rw-r--r-- | fuzzers/ztf_gen_fuzzer.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fuzzers/apply_fuzzer.cc b/fuzzers/apply_fuzzer.cc index 4e9b342..baad978 100644 --- a/fuzzers/apply_fuzzer.cc +++ b/fuzzers/apply_fuzzer.cc @@ -54,6 +54,6 @@ DEFINE_BINARY_PROTO_FUZZER(const zucchini::fuzzers::FilePair& file_pair) { zucchini::MutableBufferView new_image(new_data.data(), new_size); // Fuzz target. - zucchini::Apply(old_image, *patch_reader, new_image); + zucchini::ApplyBuffer(old_image, *patch_reader, new_image); // No need to check whether output exist, or if so, whether it's valid. } diff --git a/fuzzers/raw_gen_fuzzer.cc b/fuzzers/raw_gen_fuzzer.cc index b27042e..de63d95 100644 --- a/fuzzers/raw_gen_fuzzer.cc +++ b/fuzzers/raw_gen_fuzzer.cc @@ -56,7 +56,7 @@ DEFINE_BINARY_PROTO_FUZZER(const zucchini::fuzzers::FilePair& file_pair) { zucchini::EnsemblePatchWriter patch_writer(old_image, new_image); // Fuzz Target. - zucchini::GenerateRaw(old_image, new_image, &patch_writer); + zucchini::GenerateBufferRaw(old_image, new_image, &patch_writer); // Check that the patch size is sane. Crash the fuzzer if this isn't the case // as it is a failure in Zucchini's patch performance that is worth diff --git a/fuzzers/ztf_gen_fuzzer.cc b/fuzzers/ztf_gen_fuzzer.cc index 785aed4..ee2d47c 100644 --- a/fuzzers/ztf_gen_fuzzer.cc +++ b/fuzzers/ztf_gen_fuzzer.cc @@ -57,7 +57,7 @@ DEFINE_BINARY_PROTO_FUZZER(const zucchini::fuzzers::FilePair& file_pair) { zucchini::EnsemblePatchWriter patch_writer(old_image, new_image); // Fuzz Target. - zucchini::GenerateEnsemble(old_image, new_image, &patch_writer); + zucchini::GenerateBuffer(old_image, new_image, &patch_writer); // Write to buffer to avoid IO. size_t patch_size = patch_writer.SerializedSize(); |