Handle duplicate EXIF header #8350
Merged
Conversation
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
radarhere
reviewed
Sep 5, 2024
src/PIL/Image.py
Outdated
Comment on lines
3971
to
3973
| if data and data.startswith(b"Exif\x00\x00Exif\x00\x00"): | ||
| data = data[12:] | ||
| elif data and data.startswith(b"Exif\x00\x00"): |
There was a problem hiding this comment.
Suggested change
| if data and data.startswith(b"Exif\x00\x00Exif\x00\x00"): | |
| data = data[12:] | |
| elif data and data.startswith(b"Exif\x00\x00"): | |
| while data and data.startswith(b"Exif\x00\x00"): |
This seems simpler to me.
There was a problem hiding this comment.
Done. Also added test for this problem as well
|
In the issue, you said
Are you sure that this is an image that can be distributed under the Pillow license? |
|
Good point. I'm not a lawyer, to be safe will manually create an image where the EXIF is broken same way. |
radarhere
force-pushed
the
jamil/doubleexif
branch
from
865a6c9 to
fad5e54
Compare
Co-authored-by: Jamil Zakirov <[email protected]>
radarhere
force-pushed
the
jamil/doubleexif
branch
from
fad5e54 to
23c461e
Compare
radarhere
approved these changes
Sep 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 #8348
Changes proposed in this pull request: