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

Strengthen fuzz_write: can now close and reopen before copying

Browse source
This commit is contained in:
Chris Hennick 2023-05-10 14:54:21 -07:00
parent 6be75a9f04
commit 3af7f187d7
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -1,5 +1,6 @@
#![no_main] #![no_main]
use std::cell::RefCell;
use libfuzzer_sys::fuzz_target; use libfuzzer_sys::fuzz_target;
use arbitrary::Arbitrary; use arbitrary::Arbitrary;
use std::io::{Cursor, Read, Seek, Write}; use std::io::{Cursor, Read, Seek, Write};
@ -14,15 +15,18 @@ pub struct File {
pub enum FileOperation { pub enum FileOperation {
Write { Write {
file: File, file: File,
options: zip_next::write::FileOptions options: zip_next::write::FileOptions,
reopen: bool,
}, },
ShallowCopy { ShallowCopy {
base: Box<FileOperation>, base: Box<FileOperation>,
new_name: String new_name: String,
reopen: bool,
}, },
DeepCopy { DeepCopy {
base: Box<FileOperation>, base: Box<FileOperation>,
new_name: String new_name: String,
reopen: bool,
} }
} }
@ -34,40 +38,49 @@ impl FileOperation {
FileOperation::DeepCopy {new_name, ..} => new_name FileOperation::DeepCopy {new_name, ..} => new_name
}.to_owned() }.to_owned()
} }
pub fn should_reopen(&self) -> bool {
match self {
FileOperation::Write {reopen, ..} => *reopen,
FileOperation::ShallowCopy {reopen, ..} => *reopen,
FileOperation::DeepCopy {reopen, ..} => *reopen
}
}
} }
fn do_operation<T>(writer: &mut zip_next::ZipWriter<T>, fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
operation: &FileOperation) -> Result<(), Box<dyn std::error::Error>> operation: &FileOperation) -> Result<(), Box<dyn std::error::Error>>
where T: Read + Write + Seek { where T: Read + Write + Seek {
match operation { match operation {
FileOperation::Write {file, mut options} => { FileOperation::Write {file, mut options, ..} => {
if file.contents.iter().map(Vec::len).sum::<usize>() >= u32::MAX as usize { if file.contents.iter().map(Vec::len).sum::<usize>() >= u32::MAX as usize {
options = options.large_file(true); options = options.large_file(true);
} }
writer.start_file(file.name.to_owned(), options)?; writer.borrow_mut().start_file(file.name.to_owned(), options)?;
for chunk in &file.contents { for chunk in &file.contents {
writer.write_all(chunk.as_slice())?; writer.borrow_mut().write_all(chunk.as_slice())?;
} }
} }
FileOperation::ShallowCopy {base, new_name} => { FileOperation::ShallowCopy {base, new_name, .. } => {
do_operation(writer, base)?; do_operation(writer, base)?;
writer.shallow_copy_file(&base.get_name(), new_name)?; writer.borrow_mut().shallow_copy_file(&base.get_name(), new_name)?;
} }
FileOperation::DeepCopy {base, new_name} => { FileOperation::DeepCopy {base, new_name, .. } => {
do_operation(writer, base)?; do_operation(writer, base)?;
writer.deep_copy_file(&base.get_name(), new_name)?; writer.borrow_mut().deep_copy_file(&base.get_name(), new_name)?;
} }
} }
if operation.should_reopen() {
let new_writer = zip_next::ZipWriter::new_append(writer.borrow_mut().finish().unwrap()).unwrap();
*writer = new_writer.into();
}
Ok(()) Ok(())
} }
fuzz_target!(|data: Vec<(FileOperation, bool)>| { fuzz_target!(|data: Vec<FileOperation>| {
let mut writer = zip_next::ZipWriter::new(Cursor::new(Vec::new())); let mut writer = RefCell::new(zip_next::ZipWriter::new(Cursor::new(Vec::new())));
for (operation, close_and_reopen) in data { for operation in data {
let _ = do_operation(&mut writer, &operation); let _ = do_operation(&mut writer, &operation);
if close_and_reopen {
writer = zip_next::ZipWriter::new_append(writer.finish().unwrap()).unwrap();
}
} }
let _ = zip_next::ZipArchive::new(writer.finish().unwrap()); let _ = zip_next::ZipArchive::new(writer.borrow_mut().finish().unwrap());
}); });