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

Bug fix: reject file that's valid but unsupported as ZIP64

Browse source
This commit is contained in:
Chris Hennick 2023-05-05 09:25:52 -07:00
parent 0beb5b4294
commit 006fd57bf5
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/read.rs
View file

@ -325,11 +325,6 @@ impl<R: Read + Seek> ZipArchive<R> {
-(20 + 22 + footer.zip_file_comment.len() as i64), -(20 + 22 + footer.zip_file_comment.len() as i64),
))?; ))?;
let locator64 = spec::Zip64CentralDirectoryEndLocator::parse(reader)?; let locator64 = spec::Zip64CentralDirectoryEndLocator::parse(reader)?;
if !footer.record_too_small()
&& footer.disk_number as u32 != locator64.disk_with_central_directory
{
return unsupported_zip_error("Support for multi-disk files is not implemented");
}
// We need to reassess `archive_offset`. We know where the ZIP64 // We need to reassess `archive_offset`. We know where the ZIP64
// central-directory-end structure *should* be, but unfortunately we // central-directory-end structure *should* be, but unfortunately we
@ -344,27 +339,33 @@ impl<R: Read + Seek> ZipArchive<R> {
.ok_or(ZipError::InvalidArchive( .ok_or(ZipError::InvalidArchive(
"File cannot contain ZIP64 central directory end", "File cannot contain ZIP64 central directory end",
))?; ))?;
let (footer, archive_offset) = spec::Zip64CentralDirectoryEnd::find_and_parse( let (footer64, archive_offset) = spec::Zip64CentralDirectoryEnd::find_and_parse(
reader, reader,
locator64.end_of_central_directory_offset, locator64.end_of_central_directory_offset,
search_upper_bound, search_upper_bound,
)?; )?;
if footer.disk_number != footer.disk_with_central_directory { let directory_start = footer64
return unsupported_zip_error("Support for multi-disk files is not implemented");
}
let directory_start = footer
.central_directory_offset .central_directory_offset
.checked_add(archive_offset) .checked_add(archive_offset)
.ok_or(ZipError::InvalidArchive( .ok_or(ZipError::InvalidArchive(
"Invalid central directory size or offset", "Invalid central directory size or offset",
))?; ))?;
if footer64.disk_number != footer64.disk_with_central_directory {
return unsupported_zip_error("Support for multi-disk files is not implemented");
}
if !footer.record_too_small()
&& footer.disk_number as u32 != locator64.disk_with_central_directory
{
return unsupported_zip_error("Support for multi-disk files is not implemented");
}
Ok(( Ok((
archive_offset, archive_offset,
directory_start, directory_start,
footer.number_of_files as usize, footer64.number_of_files as usize,
)) ))
} }
@ -376,8 +377,11 @@ impl<R: Read + Seek> ZipArchive<R> {
cde_start_pos: u64, cde_start_pos: u64,
) -> ZipResult<(u64, u64, usize)> { ) -> ZipResult<(u64, u64, usize)> {
// Check if file is valid as ZIP64 first; if not, try it as ZIP32 // Check if file is valid as ZIP64 first; if not, try it as ZIP32
Self::get_directory_counts_zip64(reader, footer, cde_start_pos) match Self::get_directory_counts_zip64(reader, footer, cde_start_pos) {
.or_else(|_| Self::get_directory_counts_zip32(footer, cde_start_pos)) Ok(result) => Ok(result),
Err(ZipError::UnsupportedArchive(e)) => Err(ZipError::UnsupportedArchive(e)),
Err(_) => Self::get_directory_counts_zip32(footer, cde_start_pos),
}
} }
/// Read a ZIP archive, collecting the files it contains /// Read a ZIP archive, collecting the files it contains