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

Bug fix: fuzz_write tried to copy aborted files

Browse source
This commit is contained in:
Chris Hennick 2023-05-21 11:45:59 -07:00
parent 46333b2d61
commit d8f4d1aaa4
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -25,8 +25,8 @@ pub enum BasicFileOperation {
pub struct FileOperation { pub struct FileOperation {
basic: BasicFileOperation, basic: BasicFileOperation,
name: String, name: String,
abort: bool,
reopen: bool, reopen: bool,
// 'abort' flag is separate, to prevent trying to copy an aborted file
} }
impl FileOperation { impl FileOperation {
@ -41,7 +41,8 @@ impl FileOperation {
} }
fn do_operation<T>(writer: &mut RefCell<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,
abort: bool) -> Result<(), Box<dyn std::error::Error>>
where T: Read + Write + Seek { where T: Read + Write + Seek {
let name = operation.name; let name = operation.name;
match operation.basic { match operation.basic {
@ -62,12 +63,12 @@ fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
} }
BasicFileOperation::ShallowCopy(base) => { BasicFileOperation::ShallowCopy(base) => {
let base_name = base.referenceable_name(); let base_name = base.referenceable_name();
do_operation(writer, *base)?; do_operation(writer, *base, false)?;
writer.borrow_mut().shallow_copy_file(&base_name, &name)?; writer.borrow_mut().shallow_copy_file(&base_name, &name)?;
} }
BasicFileOperation::DeepCopy(base) => { BasicFileOperation::DeepCopy(base) => {
let base_name = base.referenceable_name(); let base_name = base.referenceable_name();
do_operation(writer, *base)?; do_operation(writer, *base, false)?;
writer.borrow_mut().deep_copy_file(&base_name, &name)?; writer.borrow_mut().deep_copy_file(&base_name, &name)?;
} }
} }
@ -81,10 +82,10 @@ fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
Ok(()) Ok(())
} }
fuzz_target!(|data: Vec<FileOperation>| { fuzz_target!(|data: Vec<(FileOperation, bool)>| {
let mut writer = RefCell::new(zip_next::ZipWriter::new(Cursor::new(Vec::new()))); let mut writer = RefCell::new(zip_next::ZipWriter::new(Cursor::new(Vec::new())));
for operation in data { for (operation, abort) in data {
let _ = do_operation(&mut writer, operation); let _ = do_operation(&mut writer, operation, abort);
} }
let _ = zip_next::ZipArchive::new(writer.borrow_mut().finish().unwrap()); let _ = zip_next::ZipArchive::new(writer.borrow_mut().finish().unwrap());
}); });