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

test(fuzz): Fix bugs that were breaking the fuzz test

Browse source
This commit is contained in:
Chris Hennick 2024-05-06 14:41:51 -07:00
parent 447f9c6e4f
commit 162c9b7281
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -19,7 +19,10 @@ pub enum BasicFileOperation<'k> {
},
ShallowCopy(Box<FileOperation<'k>>),
DeepCopy(Box<FileOperation<'k>>),
MergeWithOtherFile(Box<[FileOperation<'k>]>)
MergeWithOtherFile {
first: Box<FileOperation<'k>>,
rest: Box<[FileOperation<'k>]>
}
}
#[derive(Arbitrary, Clone, Debug)]
@ -85,13 +88,14 @@ where
do_operation(writer, &base, false, flush_on_finish_file)?;
writer.deep_copy_file_from_path(&base.path, &path)?;
}
BasicFileOperation::MergeWithOtherFile(other_ops) => {
BasicFileOperation::MergeWithOtherFile { first, rest } => {
let mut other_writer = zip::ZipWriter::new(Cursor::new(Vec::new()));
other_ops.iter().for_each(|operation| {
let _ = do_operation(&mut other_writer, &first, false, flush_on_finish_file);
rest.iter().for_each(|operation| {
let _ = do_operation(
&mut other_writer,
&operation,
abort,
false,
false,
);
});

16
src/read.rs
View file

@ -329,14 +329,10 @@ impl<R> ZipArchive<R> {
reader: R,
central_start: u64,
) -> ZipResult<Self> {
if files.is_empty() {
return Err(ZipError::InvalidArchive(
"attempt to finalize empty zip writer into readable",
));
}
/* This is where the whole file starts. */
let (_, first_header) = files.first().unwrap();
let initial_offset = first_header.header_start;
let initial_offset = match files.first() {
Some((_, file)) => file.header_start,
None => 0,
};
let shared = Arc::new(zip_archive::Shared {
files,
offset: initial_offset,
@ -368,10 +364,10 @@ impl<R: Read + Seek> ZipArchive<R> {
&mut self,
mut w: W,
) -> ZipResult<IndexMap<Box<str>, ZipFileData>> {
let mut new_files = self.shared.files.clone();
if new_files.is_empty() {
if self.shared.files.is_empty() {
return Ok(IndexMap::new());
}
let mut new_files = self.shared.files.clone();
/* The first file header will probably start at the beginning of the file, but zip doesn't
* enforce that, and executable zips like PEX files will have a shebang line so will
* definitely be greater than 0.