Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow for garbage after comment data #178

Merged
merged 3 commits into from Nov 15, 2020
Merged

Allow for garbage after comment data #178

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c4f090
allow for garbage after comment data
davide-romanini Apr 19, 2020
b91f48a
fix fmt
davide-romanini Aug 13, 2020
5eefdf8
add test for handling comment garbage
davide-romanini Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/spec.rs
View file
Open in desktop
Expand Up @@ -66,11 +66,8 @@ 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));
}
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,
Expand Down