Fix TypeError on thumbnail tags with malformed values - #260
Open
devmaiter wants to merge 1 commit into
Open
Conversation
A crafted file can declare the thumbnail offset or length tags with a non-integer field type, crashing extract_jpeg_thumbnail() with TypeError when the decoded value is a tuple. Validate the values before use and skip thumbnail extraction, keeping the remaining tags. Add a synthetic sample image reproducing the float offset case from the report, with a regression test.
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 #247
A crafted file can declare
Thumbnail JPEGInterchangeFormat(or the length tag, or the MakerNote thumbnail tag) with a field type it should not have — a float decodes to a tuple — andextract_jpeg_thumbnail()crashed withTypeError: unsupported operand type(s) for +: 'int' and 'tuple', which escapesprocess_file().The offset and length values are now validated before use: when a value is missing, negative or not an integer, a warning is logged and thumbnail extraction is skipped, while the remaining tags are still returned. Includes a synthetic sample based on the PoC from the issue and a regression test.