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

Use a struct for extra data

Browse source
This commit is contained in:
Chris Hennick 2023-05-01 17:42:04 -07:00
parent 24752c2822
commit 80f836a661
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
2 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/types.rs
View file

@ -320,6 +320,13 @@ impl Clone for AtomicU64 {
} }
} }
#[derive(Debug, Clone)]
pub struct ZipExtraDataField {
/// Header ID; indicates the type of the extra data
pub(crate) header_id: u16,
pub(crate) data: Vec<u8>
}
/// Structure representing a ZIP file. /// Structure representing a ZIP file.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct ZipFileData { pub struct ZipFileData {
@ -348,7 +355,7 @@ pub struct ZipFileData {
/// Raw file name. To be used when file_name was incorrectly decoded. /// Raw file name. To be used when file_name was incorrectly decoded.
pub file_name_raw: Vec<u8>, pub file_name_raw: Vec<u8>,
/// Extra field usually used for storage expansion /// Extra field usually used for storage expansion
pub extra_field: Vec<u8>, pub extra_field: Vec<ZipExtraDataField>,
/// File comment /// File comment
pub file_comment: String, pub file_comment: String,
/// Specifies where the local header of the file starts /// Specifies where the local header of the file starts

35
src/write.rs
View file

@ -1345,28 +1345,14 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
} }
fn validate_extra_data(file: &ZipFileData) -> ZipResult<()> { fn validate_extra_data(file: &ZipFileData) -> ZipResult<()> {
let mut data = file.extra_field.as_slice(); for field in &file.extra_field {
if field.data.len() > u16::MAX as usize {
if data.len() > spec::ZIP64_ENTRY_THR {
return Err(ZipError::Io(io::Error::new(
io::ErrorKind::InvalidData,
"Extra data exceeds extra field",
)));
}
while !data.is_empty() {
let left = data.len();
if left < 4 {
return Err(ZipError::Io(io::Error::new( return Err(ZipError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
"Incomplete extra data header", "Extra-data field can't exceed u16::MAX bytes",
))); )));
} }
let kind = data.read_u16::<LittleEndian>()?; if field.header_id == 0x0001 {
let size = data.read_u16::<LittleEndian>()? as usize;
let left = left - 4;
if kind == 0x0001 {
return Err(ZipError::Io(io::Error::new( return Err(ZipError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
"No custom ZIP64 extra data allowed", "No custom ZIP64 extra data allowed",
@ -1375,24 +1361,15 @@ fn validate_extra_data(file: &ZipFileData) -> ZipResult<()> {
#[cfg(not(feature = "unreserved"))] #[cfg(not(feature = "unreserved"))]
{ {
if kind <= 31 || EXTRA_FIELD_MAPPING.iter().any(|&mapped| mapped == kind) { if field.header_id <= 31 || EXTRA_FIELD_MAPPING.iter().any(|&mapped| mapped == kind) {
return Err(ZipError::Io(io::Error::new( return Err(ZipError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
format!( format!(
"Extra data header ID {kind:#06} requires crate feature \"unreserved\"", "Extra data header ID {field.header_id:#06} requires crate feature \"unreserved\"",
), ),
))); )));
} }
} }
if size > left {
return Err(ZipError::Io(io::Error::new(
io::ErrorKind::Other,
"Extra data size exceeds extra field",
)));
}
data = &data[size..];
} }
Ok(()) Ok(())