Skip to content

Commit f03c236

Browse files
committed
Trim whitespace from end when parsing XMP data
1 parent cb077a1 commit f03c236

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Tests/test_image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ def test_getxmp_padded(self) -> None:
989989
im = Image.new("RGB", (1, 1))
990990
im.info["xmp"] = (
991991
b'<?xpacket begin="\xef\xbb\xbf" id="W5M0MpCehiHzreSzNTczkc9d"?>\n'
992-
b'<x:xmpmeta xmlns:x="adobe:ns:meta/" />\n<?xpacket end="w"?>\x00\x00'
992+
b'<x:xmpmeta xmlns:x="adobe:ns:meta/" />\n<?xpacket end="w"?>\x00\x00 '
993993
)
994994
if ElementTree is None:
995995
with pytest.warns(

src/PIL/Image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@ def get_value(element: Element) -> str | dict[str, Any] | None:
15111511
return {}
15121512
if "xmp" not in self.info:
15131513
return {}
1514-
root = ElementTree.fromstring(self.info["xmp"].rstrip(b"\x00"))
1514+
root = ElementTree.fromstring(self.info["xmp"].rstrip(b"\x00 "))
15151515
return {get_name(root.tag): get_value(root)}
15161516

15171517
def getexif(self) -> Exif:

0 commit comments

Comments
 (0)