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

Fix memory issues on corrupt zip files

Browse source 
Do not pre-allocate the number of files, as this might be an invalid
number.

Also give a more helpfull error message when the start of the central
directory could not be found.

Resolves #68
This commit is contained in:
Mathijs van de Nes 2018-05-23 19:42:52 +02:00
parent 00310c44d8
commit 1cb79a0b91
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/read.rs
View file

@ -178,10 +178,13 @@ impl<R: Read+io::Seek> ZipArchive<R>
let (archive_offset, directory_start, number_of_files) =
try!(Self::get_directory_counts(&mut reader, &footer, cde_start_pos));
let mut files = Vec::with_capacity(number_of_files);
let mut files = Vec::new();
let mut names_map = HashMap::new();
try!(reader.seek(io::SeekFrom::Start(directory_start)));
if let Err(_) = reader.seek(io::SeekFrom::Start(directory_start)) {
return Err(ZipError::InvalidArchive("Could not seek to start of central directory"));
}
for _ in 0 .. number_of_files
{
let file = try!(central_header_to_zip_file(&mut reader, archive_offset));