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

perf: Simplify validation of empty extra-data fields

Browse source
This commit is contained in:
Chris Hennick 2024-06-14 14:39:34 -07:00
parent 2006da5ab8
commit 20d55432dc
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/write.rs
View file

@ -293,7 +293,8 @@ impl ExtendedFileOptions {
)) ))
} else { } else {
self.add_extra_data_unchecked(header_id, data, central_only)?; self.add_extra_data_unchecked(header_id, data, central_only)?;
self.validate_extra_data()?; Self::validate_extra_data(&self.extra_data)?;
Self::validate_extra_data(&self.central_extra_data)?;
Ok(()) Ok(())
} }
} }
@ -324,10 +325,11 @@ impl ExtendedFileOptions {
Ok(()) Ok(())
} }
fn validate_extra_data(&self) -> ZipResult<()> { fn validate_extra_data(data: &[u8]) -> ZipResult<()> {
let mut data = self.extra_data.to_vec();
data.extend(self.central_extra_data.iter());
let len = data.len() as u64; let len = data.len() as u64;
if len == 0 {
return Ok(());
}
if len > u16::MAX as u64 { if len > u16::MAX as u64 {
return Err(ZipError::Io(io::Error::new( return Err(ZipError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,