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

fix: Allow all reserved headers we can create

Browse source
This commit is contained in:
Chris Hennick 2024-06-14 14:06:17 -07:00
parent 1e4dcc9928
commit c218405bdd
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/write.rs
View file

@ -337,10 +337,9 @@ impl ExtendedFileOptions {
{ {
use crate::unstable::LittleEndianReadExt; use crate::unstable::LittleEndianReadExt;
let header_id = data.read_u16_le()?; let header_id = data.read_u16_le()?;
if header_id <= 31 if EXTRA_FIELD_MAPPING
|| EXTRA_FIELD_MAPPING .iter()
.iter() .any(|&mapped| mapped == header_id)
.any(|&mapped| mapped == header_id)
{ {
return Err(ZipError::Io(io::Error::new( return Err(ZipError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
@ -1933,7 +1932,7 @@ const EXTRA_FIELD_MAPPING: [u16; 43] = [
#[allow(unknown_lints)] // needless_update is new in clippy pre 1.29.0 #[allow(unknown_lints)] // needless_update is new in clippy pre 1.29.0
#[allow(clippy::needless_update)] // So we can use the same FileOptions decls with and without zopfli_buffer_size #[allow(clippy::needless_update)] // So we can use the same FileOptions decls with and without zopfli_buffer_size
mod test { mod test {
use super::{ExtendedFileOptions, FileOptions, ZipWriter}; use super::{ExtendedFileOptions, FileOptions, FullFileOptions, ZipWriter};
use crate::compression::CompressionMethod; use crate::compression::CompressionMethod;
use crate::result::ZipResult; use crate::result::ZipResult;
use crate::types::DateTime; use crate::types::DateTime;
@ -2678,4 +2677,23 @@ mod test {
let _ = writer.finish_into_readable()?; let _ = writer.finish_into_readable()?;
Ok(()) Ok(())
} }
#[test]
fn test_fuzz_crash_2024_06_14() -> ZipResult<()> {
let mut writer = ZipWriter::new(Cursor::new(Vec::new()));
writer.set_flush_on_finish_file(false);
let sub_writer = {
let mut writer = ZipWriter::new(Cursor::new(Vec::new()));
writer.set_flush_on_finish_file(false);
let options = FullFileOptions { compression_method: Stored, large_file: true, alignment: 93, ..Default::default() };
writer.start_file_from_path("\0", options)?;
writer = ZipWriter::new_append(writer.finish()?)?;
writer.deep_copy_file_from_path("\0", "")?;
writer
};
writer.merge_archive(sub_writer.finish_into_readable()?)?;
writer.deep_copy_file_from_path("", "copy")?;
let _ = writer.finish_into_readable()?;
Ok(())
}
} }