Ignore IPTC field that is only zero bytes

python-pillow · Aug 4, 2023 · 6bd3ed4 · 6bd3ed4
1 parent fc99a58
commit 6bd3ed4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py
@@ -30,6 +30,19 @@ def test_getiptcinfo_jpg_found():
     assert iptc[(2, 101)] == b"Hungary"
 
 
+def test_getiptcinfo_zero_padding():
+    # Arrange
+    with Image.open(TEST_FILE) as im:
+        im.info["photoshop"][0x0404] += b"\x00\x00\x00"
+
+        # Act
+        iptc = IptcImagePlugin.getiptcinfo(im)
+
+    # Assert
+    assert isinstance(iptc, dict)
+    assert len(iptc) == 3
+
+
 def test_getiptcinfo_tiff_none():
     # Arrange
     with Image.open("Tests/images/hopper.tif") as im:

diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py
@@ -58,7 +58,7 @@ def field(self):
         #
         # get a IPTC field header
         s = self.fp.read(5)
-        if not len(s):
+        if not s.strip(b"\x00"):
             return None, 0
 
         tag = s[1], s[2]