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

move encrypted and data descriptor validation up higher

Browse source
This commit is contained in:
Danny McClanahan 2024-05-18 04:32:06 -04:00
parent cf2d980612
commit 41813d242c
No known key found for this signature in database
GPG key ID: 6105C10F1A199CC7
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/types.rs
View file

@ -623,27 +623,29 @@ impl ZipFileData {
.. ..
} = block; } = block;
let encrypted: bool = flags & 1 == 1;
/* FIXME: these were previously incorrect: add testing! */
/* flags & (1 << 1) != 0 */
let is_utf8: bool = flags & (1 << 11) != 0;
/* flags & (1 << 3) != 0 */
let using_data_descriptor: bool = flags & (1 << 3) == 1 << 3;
let compression_method = crate::CompressionMethod::parse_from_u16(compression_method);
let file_name_length: usize = file_name_length.into();
let extra_field_length: usize = extra_field_length.into();
let encrypted: bool = flags & 1 == 1;
if encrypted { if encrypted {
return Err(ZipError::UnsupportedArchive( return Err(ZipError::UnsupportedArchive(
"Encrypted files are not supported", "Encrypted files are not supported",
)); ));
} }
/* FIXME: these were previously incorrect: add testing! */
/* flags & (1 << 3) != 0 */
let using_data_descriptor: bool = flags & (1 << 3) == 1 << 3;
if using_data_descriptor { if using_data_descriptor {
return Err(ZipError::UnsupportedArchive( return Err(ZipError::UnsupportedArchive(
"The file length is not available in the local header", "The file length is not available in the local header",
)); ));
} }
/* flags & (1 << 1) != 0 */
let is_utf8: bool = flags & (1 << 11) != 0;
let compression_method = crate::CompressionMethod::parse_from_u16(compression_method);
let file_name_length: usize = file_name_length.into();
let extra_field_length: usize = extra_field_length.into();
let mut file_name_raw = vec![0u8; file_name_length]; let mut file_name_raw = vec![0u8; file_name_length];
reader.read_exact(&mut file_name_raw)?; reader.read_exact(&mut file_name_raw)?;
let mut extra_field = vec![0u8; extra_field_length]; let mut extra_field = vec![0u8; extra_field_length];