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

ci(fuzz): Allow setting the comment any time

Browse source
This commit is contained in:
Chris Hennick 2024-06-18 20:04:20 -07:00
parent 9bf914d7d4
commit 9f7e64b9df
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -24,7 +24,8 @@ pub enum BasicFileOperation<'k> {
DeepCopy(Box<FileOperation<'k>>), DeepCopy(Box<FileOperation<'k>>),
MergeWithOtherFile { MergeWithOtherFile {
operations: Box<[(FileOperation<'k>, bool)]> operations: Box<[(FileOperation<'k>, bool)]>
} },
SetArchiveComment(Box<[u8]>)
} }
#[derive(Arbitrary, Clone, Debug, Eq, PartialEq)] #[derive(Arbitrary, Clone, Debug, Eq, PartialEq)]
@ -45,6 +46,7 @@ pub struct FileOperation<'k> {
impl <'k> FileOperation<'k> { impl <'k> FileOperation<'k> {
fn get_path(&self) -> Option<Cow<PathBuf>> { fn get_path(&self) -> Option<Cow<PathBuf>> {
match &self.basic { match &self.basic {
BasicFileOperation::SetArchiveComment(_) => None,
BasicFileOperation::WriteDirectory(_) => Some(Cow::Owned(self.path.join("/"))), BasicFileOperation::WriteDirectory(_) => Some(Cow::Owned(self.path.join("/"))),
BasicFileOperation::MergeWithOtherFile { operations } => BasicFileOperation::MergeWithOtherFile { operations } =>
operations.iter().flat_map(|(op, abort)| if !abort { op.get_path() } else { None }).next(), operations.iter().flat_map(|(op, abort)| if !abort { op.get_path() } else { None }).next(),
@ -101,6 +103,9 @@ impl <'k> Debug for FileOperation<'k> {
};\n\ };\n\
writer.merge_archive(sub_writer.finish_into_readable()?)?;\n")?; writer.merge_archive(sub_writer.finish_into_readable()?)?;\n")?;
}, },
BasicFileOperation::SetArchiveComment(comment) => {
f.write_fmt(format_args!("writer.set_raw_comment({:?}.into());\n", comment))?;
}
} }
match &self.reopen { match &self.reopen {
ReopenOption::DoNotReopen => Ok(()), ReopenOption::DoNotReopen => Ok(()),
@ -116,7 +121,6 @@ impl <'k> Debug for FileOperation<'k> {
#[derive(Arbitrary, Clone)] #[derive(Arbitrary, Clone)]
pub struct FuzzTestCase<'k> { pub struct FuzzTestCase<'k> {
comment: Box<[u8]>,
operations: Box<[(FileOperation<'k>, bool)]>, operations: Box<[(FileOperation<'k>, bool)]>,
flush_on_finish_file: bool, flush_on_finish_file: bool,
} }
@ -125,8 +129,7 @@ impl <'k> Debug for FuzzTestCase<'k> {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.write_fmt(format_args!( f.write_fmt(format_args!(
"let mut writer = ZipWriter::new(Cursor::new(Vec::new()));\n\ "let mut writer = ZipWriter::new(Cursor::new(Vec::new()));\n\
writer.set_flush_on_finish_file({:?});\n\ writer.set_flush_on_finish_file({:?});\n", self.flush_on_finish_file))?;
writer.set_raw_comment(Box::<[u8]>::from({:?}));\n", self.flush_on_finish_file, self.comment))?;
self.operations.iter().map(|op| { self.operations.iter().map(|op| {
f.write_fmt(format_args!("{:?}", op.0))?; f.write_fmt(format_args!("{:?}", op.0))?;
if op.1 { if op.1 {
@ -223,6 +226,9 @@ where
}); });
writer.merge_archive(other_writer.finish_into_readable()?)?; writer.merge_archive(other_writer.finish_into_readable()?)?;
*files_added += inner_files_added; *files_added += inner_files_added;
},
BasicFileOperation::SetArchiveComment(comment) => {
writer.set_raw_comment(comment.clone());
} }
} }
if abort && *files_added != 0 { if abort && *files_added != 0 {
@ -246,7 +252,6 @@ where
fuzz_target!(|test_case: FuzzTestCase| { fuzz_target!(|test_case: FuzzTestCase| {
let mut files_added = 0; let mut files_added = 0;
let mut writer = zip::ZipWriter::new(Cursor::new(Vec::new())); let mut writer = zip::ZipWriter::new(Cursor::new(Vec::new()));
writer.set_raw_comment(test_case.comment);
let mut final_reopen = false; let mut final_reopen = false;
if let Some((last_op, _)) = test_case.operations.last() { if let Some((last_op, _)) = test_case.operations.last() {
if last_op.reopen != ReopenOption::ViaFinishIntoReadable { if last_op.reopen != ReopenOption::ViaFinishIntoReadable {