Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Tests/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,12 @@ def test_duplicate_exif_header(self) -> None:
exif = im.getexif()
assert exif[274] == 1

with Image.open("Tests/images/exif.png") as im:
im.load()
im.info["exif"] = b"Exif\x00\x00" * 2 + im.info["exif"]
with pytest.raises(SyntaxError):
im.getexif()

def test_empty_get_ifd(self) -> None:
exif = Image.Exif()
ifd = exif.get_ifd(0x8769)
Expand Down
3 changes: 1 addition & 2 deletions src/PIL/Image.py
Original file line number Diff line number Diff line change
Expand Up @@ -4143,8 +4143,7 @@ def load(self, data: bytes) -> None:
self._data.clear()
self._hidden_data.clear()
self._ifds.clear()
while data and data.startswith(b"Exif\x00\x00"):
data = data[6:]
data = re.sub(b"^(Exif\x00\x00){1,2}", b"", data)
if not data:
self._info = None
return
Expand Down
Loading