DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Update fuzz_write to use replace_with

Browse source
This commit is contained in:
Chris Hennick 2024-05-05 20:09:23 -07:00
parent e9d48b7333
commit f2b55a1f59
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fuzz/Cargo.toml
View file

@ -11,6 +11,7 @@ cargo-fuzz = true
[dependencies] [dependencies]
libfuzzer-sys = "0.4" libfuzzer-sys = "0.4"
arbitrary = { version = "1.3.0", features = ["derive"] } arbitrary = { version = "1.3.0", features = ["derive"] }
replace_with = "0.1.7"
[dependencies.zip] [dependencies.zip]
path = ".." path = ".."

42
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -2,7 +2,7 @@
use arbitrary::Arbitrary; use arbitrary::Arbitrary;
use libfuzzer_sys::fuzz_target; use libfuzzer_sys::fuzz_target;
use std::cell::RefCell; use replace_with::replace_with_or_abort;
use std::io::{Cursor, Read, Seek, Write}; use std::io::{Cursor, Read, Seek, Write};
use std::path::PathBuf; use std::path::PathBuf;
@ -37,7 +37,7 @@ pub struct FuzzTestCase {
} }
fn do_operation<T>( fn do_operation<T>(
writer: &mut RefCell<zip::ZipWriter<T>>, writer: &mut zip::ZipWriter<T>,
operation: &FileOperation, operation: &FileOperation,
abort: bool, abort: bool,
flush_on_finish_file: bool, flush_on_finish_file: bool,
@ -45,9 +45,7 @@ fn do_operation<T>(
where where
T: Read + Write + Seek, T: Read + Write + Seek,
{ {
writer writer.set_flush_on_finish_file(flush_on_finish_file);
.borrow_mut()
.set_flush_on_finish_file(flush_on_finish_file);
let path = &operation.path; let path = &operation.path;
match &operation.basic { match &operation.basic {
BasicFileOperation::WriteNormalFile { BasicFileOperation::WriteNormalFile {
@ -60,44 +58,44 @@ where
if uncompressed_size >= u32::MAX as usize { if uncompressed_size >= u32::MAX as usize {
options = options.large_file(true); options = options.large_file(true);
} }
writer.borrow_mut().start_file_from_path(path, options)?; writer.start_file_from_path(path, options)?;
for chunk in contents { for chunk in contents {
writer.borrow_mut().write_all(chunk.as_slice())?; writer.write_all(chunk.as_slice())?;
} }
} }
BasicFileOperation::WriteDirectory(options) => { BasicFileOperation::WriteDirectory(options) => {
writer.borrow_mut().add_directory_from_path(path, options.to_owned())?; writer.add_directory_from_path(path, options.to_owned())?;
} }
BasicFileOperation::WriteSymlinkWithTarget { target, options } => { BasicFileOperation::WriteSymlinkWithTarget { target, options } => {
writer writer.add_symlink_from_path(&path, target, options.to_owned())?;
.borrow_mut()
.add_symlink_from_path(&path, target, options.to_owned())?;
} }
BasicFileOperation::ShallowCopy(base) => { BasicFileOperation::ShallowCopy(base) => {
do_operation(writer, &base, false, flush_on_finish_file)?; do_operation(writer, &base, false, flush_on_finish_file)?;
writer.borrow_mut().shallow_copy_file_from_path(&base.path, &path)?; writer.shallow_copy_file_from_path(&base.path, &path)?;
} }
BasicFileOperation::DeepCopy(base) => { BasicFileOperation::DeepCopy(base) => {
do_operation(writer, &base, false, flush_on_finish_file)?; do_operation(writer, &base, false, flush_on_finish_file)?;
writer.borrow_mut().deep_copy_file_from_path(&base.path, &path)?; writer.deep_copy_file_from_path(&base.path, &path)?;
} }
} }
if abort { if abort {
writer.borrow_mut().abort_file().unwrap(); writer.abort_file().unwrap();
} }
if operation.reopen { if operation.reopen {
let old_comment = writer.borrow().get_raw_comment().to_owned(); let old_comment = writer.get_raw_comment().to_owned();
let new_writer = replace_with_or_abort(writer, |old_writer: zip::ZipWriter<T>| {
zip::ZipWriter::new_append(writer.borrow_mut().finish().unwrap()).unwrap(); let new_writer =
assert_eq!(&old_comment, new_writer.get_raw_comment()); zip::ZipWriter::new_append(old_writer.finish().unwrap()).unwrap();
*writer = new_writer.into(); assert_eq!(&old_comment, new_writer.get_raw_comment());
new_writer
});
} }
Ok(()) Ok(())
} }
fuzz_target!(|test_case: FuzzTestCase| { fuzz_target!(|test_case: FuzzTestCase| {
let mut writer = RefCell::new(zip::ZipWriter::new(Cursor::new(Vec::new()))); let mut writer = zip::ZipWriter::new(Cursor::new(Vec::new()));
writer.borrow_mut().set_raw_comment(test_case.comment); writer.set_raw_comment(test_case.comment);
for (operation, abort) in test_case.operations { for (operation, abort) in test_case.operations {
let _ = do_operation( let _ = do_operation(
&mut writer, &mut writer,
@ -106,5 +104,5 @@ fuzz_target!(|test_case: FuzzTestCase| {
test_case.flush_on_finish_file, test_case.flush_on_finish_file,
); );
} }
let _ = zip::ZipArchive::new(writer.borrow_mut().finish().unwrap()); let _ = zip::ZipArchive::new(writer.finish().unwrap());
}); });