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

ci(fuzz): Fix: skip copying if we can't find a file from a previous operation

Browse source
This commit is contained in:
Chris Hennick 2024-06-17 19:21:04 -07:00
parent 6bf354a0d6
commit 5231469734
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -43,12 +43,12 @@ pub struct FileOperation<'k> {
} }
impl <'k> FileOperation<'k> { impl <'k> FileOperation<'k> {
fn get_path(&self) -> Cow<PathBuf> { fn get_path(&self) -> Option<Cow<PathBuf>> {
match &self.basic { match &self.basic {
BasicFileOperation::WriteDirectory(_) => Cow::Owned(self.path.join("/")), BasicFileOperation::WriteDirectory(_) => Some(Cow::Owned(self.path.join("/"))),
BasicFileOperation::MergeWithOtherFile { operations } => BasicFileOperation::MergeWithOtherFile { operations } =>
operations[0].0.get_path(), operations.iter().flat_map(|(op, abort)| if !abort { op.get_path() } else { None }).next(),
_ => Cow::Borrowed(&self.path) _ => Some(Cow::Borrowed(&self.path))
} }
} }
} }
@ -74,10 +74,16 @@ impl <'k> Debug for FileOperation<'k> {
options, self.path, target.to_owned()))?; options, self.path, target.to_owned()))?;
}, },
BasicFileOperation::ShallowCopy(base) => { BasicFileOperation::ShallowCopy(base) => {
f.write_fmt(format_args!("{:?}writer.shallow_copy_file_from_path({:?}, {:?})?;\n", base, base.get_path(), self.path))?; let Some(base_path) = base.get_path() else {
return Ok(())
};
f.write_fmt(format_args!("{:?}writer.shallow_copy_file_from_path({:?}, {:?})?;\n", base, base_path, self.path))?;
}, },
BasicFileOperation::DeepCopy(base) => { BasicFileOperation::DeepCopy(base) => {
f.write_fmt(format_args!("{:?}writer.deep_copy_file_from_path({:?}, {:?})?;\n", base, base.get_path(), self.path))?; let Some(base_path) = base.get_path() else {
return Ok(())
};
f.write_fmt(format_args!("{:?}writer.deep_copy_file_from_path({:?}, {:?})?;\n", base, base_path, self.path))?;
}, },
BasicFileOperation::MergeWithOtherFile {operations} => { BasicFileOperation::MergeWithOtherFile {operations} => {
f.write_str("let sub_writer = {\n\ f.write_str("let sub_writer = {\n\
@ -188,15 +194,21 @@ where
*files_added += 1; *files_added += 1;
} }
BasicFileOperation::ShallowCopy(base) => { BasicFileOperation::ShallowCopy(base) => {
deduplicate_paths(&mut path, &base.get_path()); let Some(base_path) = base.get_path() else {
return Ok(());
};
deduplicate_paths(&mut path, &base_path);
do_operation(writer, &base, false, flush_on_finish_file, files_added)?; do_operation(writer, &base, false, flush_on_finish_file, files_added)?;
writer.shallow_copy_file_from_path(&*base.get_path(), &*path)?; writer.shallow_copy_file_from_path(&*base_path, &*path)?;
*files_added += 1; *files_added += 1;
} }
BasicFileOperation::DeepCopy(base) => { BasicFileOperation::DeepCopy(base) => {
deduplicate_paths(&mut path, &base.get_path()); let Some(base_path) = base.get_path() else {
return Ok(());
};
deduplicate_paths(&mut path, &base_path);
do_operation(writer, &base, false, flush_on_finish_file, files_added)?; do_operation(writer, &base, false, flush_on_finish_file, files_added)?;
writer.deep_copy_file_from_path(&*base.get_path(), &*path)?; writer.deep_copy_file_from_path(&*base_path, &*path)?;
*files_added += 1; *files_added += 1;
} }
BasicFileOperation::MergeWithOtherFile { operations } => { BasicFileOperation::MergeWithOtherFile { operations } => {