Skip to content

[RBT-273] Skip tags with bad value pointers #2

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

Closed
mikhail-iurkov wants to merge 2 commits into from
Closed

[RBT-273] Skip tags with bad value pointers #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
329a879
Skip tags with bad value pointers
mikhail-iurkov Jan 19, 2022
0a4cbbe
Merge branch 'master' into bad-pointers
homm Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions piexif/_load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@ def __init__(self, data):
raise InvalidImageDataError("Given file is neither JPEG nor TIFF.")

def get_ifd_dict(self, pointer, ifd_name, read_unknown=False):
try:
result = self._do_get_ifd_dict(pointer, ifd_name, read_unknown)
except struct.error:
# Bad pointers will appear as `struct.error`
result = {}
return result

def _do_get_ifd_dict(self, pointer, ifd_name, read_unknown=False):
ifd_dict = {}
tag_count = unpack_from(self.endian_mark + "H",
self.tiftag, pointer)[0]
Expand Down
Binary file added tests/images/r_bad_pointer.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion tests/s_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,9 @@ def test_roundtrip_files(self):
if ifd == "0th":
if ImageIFD.ExifTag in exif["0th"]:
exif["0th"].pop(ImageIFD.ExifTag)
e["0th"].pop(ImageIFD.ExifTag)
# In case of invalid pointer, PIL uses
# pointer value as tag value, rather than skip it
e["0th"].pop(ImageIFD.ExifTag, None)
if ImageIFD.GPSTag in exif["0th"]:
exif["0th"].pop(ImageIFD.GPSTag)
e["0th"].pop(ImageIFD.GPSTag)
Expand Down