python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-24 17:06:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7753 from radarhere/eps

Browse Source
This commit is contained in:
Hugo van Kemenade 2024-03-11 17:51:29 +02:00 committed by GitHub
commit 9ad22fc96a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/test_file_eps.py
View File

@ -437,3 +437,11 @@ def test_eof_before_bounding_box() -> None:
with pytest.raises(OSError): with pytest.raises(OSError):
with Image.open("Tests/images/zero_bb_eof_before_boundingbox.eps"): with Image.open("Tests/images/zero_bb_eof_before_boundingbox.eps"):
pass pass
def test_invalid_data_after_eof() -> None:
with open("Tests/images/illuCS6_preview.eps", "rb") as f:
img_bytes = io.BytesIO(f.read() + b"\r\n%" + (b" " * 255))
with Image.open(img_bytes) as img:
assert img.mode == "RGB"

8
src/PIL/EpsImagePlugin.py
View File

@ -356,14 +356,10 @@ class EpsImageFile(ImageFile.ImageFile):
self._size = columns, rows self._size = columns, rows
return return
elif bytes_mv[:5] == b"%%EOF":
break
elif trailer_reached and reading_trailer_comments: elif trailer_reached and reading_trailer_comments:
# Load EPS trailer # Load EPS trailer
# if this line starts with "%%EOF",
# then we've reached the end of the file
if bytes_mv[:5] == b"%%EOF":
break
s = str(bytes_mv[:bytes_read], "latin-1") s = str(bytes_mv[:bytes_read], "latin-1")
_read_comment(s) _read_comment(s)
elif bytes_mv[:9] == b"%%Trailer": elif bytes_mv[:9] == b"%%Trailer":