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

Bug fixes

Browse source
This commit is contained in:
Chris Hennick 2023-05-13 14:29:00 -07:00
parent 6e4d60e0ca
commit a2ed77abd3
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -49,8 +49,9 @@ 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) -> Result<(), Box<dyn std::error::Error>>
where T: Read + Write + Seek { where T: Read + Write + Seek {
let should_reopen = operation.should_reopen();
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 {
@ -61,16 +62,18 @@ fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
writer.borrow_mut().write_all(chunk.as_slice())?; writer.borrow_mut().write_all(chunk.as_slice())?;
} }
} }
FileOperation::ShallowCopy {base, new_name, .. } => { FileOperation::ShallowCopy {base, ref new_name, .. } => {
do_operation(writer, base)?; let base_name = base.get_name();
writer.borrow_mut().shallow_copy_file(&base.get_name(), new_name)?; do_operation(writer, *base)?;
writer.borrow_mut().shallow_copy_file(&base_name, new_name)?;
} }
FileOperation::DeepCopy {base, new_name, .. } => { FileOperation::DeepCopy {base, ref new_name, .. } => {
do_operation(writer, base)?; let base_name = base.get_name();
writer.borrow_mut().deep_copy_file(&base.get_name(), new_name)?; do_operation(writer, *base)?;
writer.borrow_mut().deep_copy_file(&base_name, new_name)?;
} }
} }
if operation.should_reopen() { if should_reopen {
let new_writer = zip_next::ZipWriter::new_append(writer.borrow_mut().finish().unwrap()).unwrap(); let new_writer = zip_next::ZipWriter::new_append(writer.borrow_mut().finish().unwrap()).unwrap();
*writer = new_writer.into(); *writer = new_writer.into();
} }
@ -80,7 +83,7 @@ fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
fuzz_target!(|data: Vec<FileOperation>| { fuzz_target!(|data: Vec<FileOperation>| {
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 in data {
let _ = do_operation(&mut writer, &operation); let _ = do_operation(&mut writer, operation);
} }
let _ = zip_next::ZipArchive::new(writer.borrow_mut().finish().unwrap()); let _ = zip_next::ZipArchive::new(writer.borrow_mut().finish().unwrap());
}); });

1
src/write.rs
View file

@ -1247,6 +1247,7 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
writer.write_all(&zip64_extra_field[..zip64_extra_field_length as usize])?; writer.write_all(&zip64_extra_field[..zip64_extra_field_length as usize])?;
// extra field // extra field
writer.write_all(&file.extra_field)?; writer.write_all(&file.extra_field)?;
writer.write_all(&file.central_extra_field)?;
// file comment // file comment
// <none> // <none>