Merge pull request #8350 from zakajd/jamil/doubleexif

python-pillow · Sep 7, 2024 · f06b851 · f06b851
2 parents a838da7 + 2f25dbc
commit f06b851
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Tests/test_image.py b/Tests/test_image.py
@@ -775,6 +775,14 @@ def test_empty_exif(self) -> None:
         exif.load(b"Exif\x00\x00")
         assert not dict(exif)
 
+    def test_duplicate_exif_header(self) -> None:
+        with Image.open("Tests/images/exif.png") as im:
+            im.load()
+            im.info["exif"] = b"Exif\x00\x00" + im.info["exif"]
+
+            exif = im.getexif()
+        assert exif[274] == 1
+
     def test_empty_get_ifd(self) -> None:
         exif = Image.Exif()
         ifd = exif.get_ifd(0x8769)

diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -3968,7 +3968,7 @@ def load(self, data: bytes) -> None:
         self._data.clear()
         self._hidden_data.clear()
         self._ifds.clear()
-        if data and data.startswith(b"Exif\x00\x00"):
+        while data and data.startswith(b"Exif\x00\x00"):
             data = data[6:]
         if not data:
             self._info = None