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

Merge pull request #178 from davide-romanini/forgive-after-comment-junk

Browse source 
Allow for garbage after comment data
This commit is contained in:
Plecra 2020-11-15 21:32:38 +00:00 • committed by GitHub
commit f5061c25e9
Signed by: DevComp
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/spec.rs
View file

@ -66,12 +66,9 @@ impl CentralDirectoryEnd {
reader.seek(io::SeekFrom::Current(
BYTES_BETWEEN_MAGIC_AND_COMMENT_SIZE as i64,
))?;
let comment_length = reader.read_u16::<LittleEndian>()? as u64;
if file_length - pos - HEADER_SIZE == comment_length {
let cde_start_pos = reader.seek(io::SeekFrom::Start(pos as u64))?;
return CentralDirectoryEnd::parse(reader).map(|cde| (cde, cde_start_pos));
}
}
pos = match pos.checked_sub(1) {
Some(p) => p,
None => break,

BIN
tests/data/comment_garbage.zip Normal file
View file

Binary file not shown.

30
tests/zip_comment_garbage.rs Normal file
View file

@ -0,0 +1,30 @@
// Some zip files can contain garbage after the comment. For example, python zipfile generates
// it when opening a zip in 'a' mode:
//
// >>> from zipfile import ZipFile
// >>> with ZipFile('comment_garbage.zip', 'a') as z:
// ... z.comment = b'long comment bla bla bla'
// ...
// >>> with ZipFile('comment_garbage.zip', 'a') as z:
// ... z.comment = b'short.'
// ...
// >>>
//
// Hexdump:
//
// 00000000 50 4b 05 06 00 00 00 00 00 00 00 00 00 00 00 00 |PK..............|
// 00000010 00 00 00 00 06 00 73 68 6f 72 74 2e 6f 6d 6d 65 |......short.omme|
// 00000020 6e 74 20 62 6c 61 20 62 6c 61 20 62 6c 61 |nt bla bla bla|
// 0000002e
use std::io;
use zip::ZipArchive;
#[test]
fn correctly_handle_zip_with_garbage_after_comment() {
let mut v = Vec::new();
v.extend_from_slice(include_bytes!("../tests/data/comment_garbage.zip"));
let archive = ZipArchive::new(io::Cursor::new(v)).expect("couldn't open test zip file");
assert_eq!(archive.comment(), "short.".as_bytes());
}