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

Merge branch 'master' into xz

Browse source
This commit is contained in:
Chris Hennick 2024-06-21 20:29:30 -07:00 • committed by GitHub
commit c0ede17cd0
Signed by: DevComp
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/read.rs
View file

@ -582,7 +582,7 @@ impl<R: Read + Seek> ZipArchive<R> {
disk_number: footer.disk_number as u32, disk_number: footer.disk_number as u32,
disk_with_central_directory: footer.disk_with_central_directory as u32, disk_with_central_directory: footer.disk_with_central_directory as u32,
cde_position: cde_start_pos, cde_position: cde_start_pos,
is_zip64: false is_zip64: false,
}) })
} }
@ -705,7 +705,10 @@ impl<R: Read + Seek> ZipArchive<R> {
let mut unsupported_errors_64 = Vec::new(); let mut unsupported_errors_64 = Vec::new();
let mut ok_results = Vec::new(); let mut ok_results = Vec::new();
let cde_locations = spec::Zip32CentralDirectoryEnd::find_and_parse(reader)?; let cde_locations = spec::Zip32CentralDirectoryEnd::find_and_parse(reader)?;
cde_locations.into_vec().into_iter().for_each(|(footer, cde_start_pos)| { cde_locations
.into_vec()
.into_iter()
.for_each(|(footer, cde_start_pos)| {
let zip32_result = let zip32_result =
Self::get_directory_info_zip32(&config, reader, &footer, cde_start_pos); Self::get_directory_info_zip32(&config, reader, &footer, cde_start_pos);
Self::sort_result( Self::sort_result(
@ -737,12 +740,13 @@ impl<R: Read + Seek> ZipArchive<R> {
); );
}); });
}); });
} });
); ok_results.sort_by_key(|(_, result)| {
ok_results.sort_by_key(|(_, result)| ( (
!result.is_zip64, // try ZIP64 first !result.is_zip64, // try ZIP64 first
u64::MAX - result.cde_position, // try the last one first u64::MAX - result.cde_position, // try the last one first
)); )
});
let mut best_result = None; let mut best_result = None;
for (footer, result) in ok_results { for (footer, result) in ok_results {
let mut inner_result = Vec::with_capacity(1); let mut inner_result = Vec::with_capacity(1);
@ -760,7 +764,7 @@ impl<R: Read + Seek> ZipArchive<R> {
&mut unsupported_errors_32 &mut unsupported_errors_32
}, },
&mut inner_result, &mut inner_result,
&() &(),
); );
if let Some((_, shared)) = inner_result.into_iter().next() { if let Some((_, shared)) = inner_result.into_iter().next() {
if shared.files.len() == footer.number_of_files as usize if shared.files.len() == footer.number_of_files as usize
@ -773,16 +777,17 @@ impl<R: Read + Seek> ZipArchive<R> {
&mut invalid_errors_64 &mut invalid_errors_64
} else { } else {
&mut invalid_errors_32 &mut invalid_errors_32
}.push(InvalidArchive("wrong number of files")) }
.push(InvalidArchive("wrong number of files"))
} }
} }
} }
let Some((footer, shared)) = best_result else { let Some((footer, shared)) = best_result else {
return Err(unsupported_errors_32.into_iter() return Err(unsupported_errors_32
.into_iter()
.chain(unsupported_errors_64.into_iter()) .chain(unsupported_errors_64.into_iter())
.chain(invalid_errors_32.into_iter()) .chain(invalid_errors_32.into_iter())
.chain(invalid_errors_64.into_iter()) .chain(invalid_errors_64.into_iter())
.next() .next()
.unwrap()); .unwrap());
}; };
@ -1711,12 +1716,12 @@ pub fn read_zipfile_from_stream<'a, R: Read>(reader: &'a mut R) -> ZipResult<Opt
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use crate::result::ZipResult;
use crate::write::SimpleFileOptions;
use crate::CompressionMethod::Stored;
use crate::{ZipArchive, ZipWriter}; use crate::{ZipArchive, ZipWriter};
use std::io::{Cursor, Read, Write}; use std::io::{Cursor, Read, Write};
use tempdir::TempDir; use tempdir::TempDir;
use crate::CompressionMethod::Stored;
use crate::result::ZipResult;
use crate::write::SimpleFileOptions;
#[test] #[test]
fn invalid_offset() { fn invalid_offset() {
@ -1952,7 +1957,10 @@ mod test {
#[test] #[test]
fn test_64k_files() -> ZipResult<()> { fn test_64k_files() -> ZipResult<()> {
let mut writer = ZipWriter::new(Cursor::new(Vec::new())); let mut writer = ZipWriter::new(Cursor::new(Vec::new()));
let options = SimpleFileOptions {compression_method: Stored, ..Default::default()}; let options = SimpleFileOptions {
compression_method: Stored,
..Default::default()
};
for i in 0..=u16::MAX { for i in 0..=u16::MAX {
let file_name = format!("{i}.txt"); let file_name = format!("{i}.txt");
writer.start_file(&*file_name, options)?; writer.start_file(&*file_name, options)?;