Handle malformed HEIC box types and invalid thumbnail offsets#253
Open
bysiber wants to merge 1 commit intoianare:masterfrom
Open
Handle malformed HEIC box types and invalid thumbnail offsets#253bysiber wants to merge 1 commit intoianare:masterfrom
bysiber wants to merge 1 commit intoianare:masterfrom
Conversation
Fix two crashes when processing malformed image files: - HEIC files with non-ASCII box types now raise InvalidExif instead of crashing with UnicodeDecodeError (fixes ianare#245) - JPEG files with non-integer thumbnail offsets are gracefully skipped instead of crashing with TypeError (fixes ianare#247)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes two crashes that happen when
process_fileencounters malformed image files:1. HEIC files with non-ASCII box types (#245)
HEICExifFinder.next_box()callsself.get(4).decode("ascii")on the raw box type bytes, which blows up withUnicodeDecodeErrorif a byte is outside the ASCII range. This now catches the decode error and raisesInvalidExifinstead, whichprocess_filealready knows how to handle.2. JPEG files with non-integer thumbnail offsets (#247)
extract_jpeg_thumbnail()doesself.offset + thumb_offset.values[0], but if the EXIF tag stores a non-integer value (like a tuple), this raisesTypeError. Added a try/except around the thumbnail extraction so a bad offset just gets skipped with a debug log message.Both cases previously let unhandled exceptions escape
process_file, crashing any application that parses untrusted images. All existing tests pass.