Pillow fails to load truncated images with LOAD_TRUNCATED_IMAGES #1366
Conversation
This file contains 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
| @@ -204,11 +206,11 @@ def load(self): | |||
| while True: | |||
| try: | |||
| s = read(self.decodermaxblock) | |||
| except IndexError as ie: # truncated png/gif | |||
| except (IndexError, struct.error) as ie: # truncated png/gif | |||
There was a problem hiding this comment.
ie is unused, since you've replaced it with a string below.
homm
changed the title
|
I'm reasonably certain that notifications aren't sent out for this, so just letting you know there is now a merge conflict for this PR. The resolution is a simple one. |
homm
force-pushed
the
fix-truncated-regression-from-master
branch
from
a2f121d
to
1d236f0
Compare
|
Rebased. |
wiredfool
added a commit
that referenced
this pull request
Sep 10, 2015
…m-master Pillow fails to load truncated images with LOAD_TRUNCATED_IMAGES
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes regression from #1121 (version 2.8.1).
Starting from #1121 all functions in
_binary.pystart raisingstruct.errorinstead ofIndexError. This leads to two side effects with truncated PNG images: wrong exception type whenLOAD_TRUNCATED_IMAGES = Falseand truncated files are not loaded whenLOAD_TRUNCATED_IMAGES = True.