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

perf: Refactor extra-data validation

Browse source
This commit is contained in:
Chris Hennick 2024-06-14 15:26:27 -07:00
parent 2eee2798a5
commit 9d9c1ce1f1
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/write.rs
View file

@ -954,7 +954,8 @@ impl<W: Write + Seek> ZipWriter<W> {
)?;
}
}
if extra_data.len() > 0 {
let extra_data_len = extra_data.len();
if extra_data_len > 0 {
writer.write_all(&extra_data)?;
extra_data_end = writer.stream_position()?;
debug_assert_eq!(extra_data_end % (options.alignment.max(1) as u64), 0);
@ -964,6 +965,11 @@ impl<W: Write + Seek> ZipWriter<W> {
}
if let Some(data) = central_extra_data {
ExtendedFileOptions::validate_extra_data(&data)?;
let central_extra_data_len = extra_data_len + data.len();
if central_extra_data_len > u16::MAX as usize {
self.abort_file()?;
return Err(InvalidArchive("Central extra data would exceed 64 KiB"));
}
file.central_extra_field = Some(data.clone());
}
debug_assert!(file.data_start.get().is_none());