Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent extra EPS header validations #8144

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Prevent extra EPS header validations #8144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2c0a90
check required EPS header comments at end of file, not always
Yay295 Jun 17, 2024
065aeae
improve check_required_header_comments() description
Yay295 Jun 24, 2024
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
9 changes: 7 additions & 2 deletions src/PIL/EpsImagePlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,11 @@ def _open(self) -> None:
trailer_reached = False

def check_required_header_comments() -> None:
"""
The EPS specification requires that some headers exist.
This should be checked when the header comments formally end,
when image data starts, or when the file ends, whichever comes first.
"""
if "PS-Adobe" not in self.info:
msg = 'EPS header missing "%!PS-Adobe" comment'
raise SyntaxError(msg)
Expand Down Expand Up @@ -270,6 +275,8 @@ def _read_comment(s: str) -> bool:
if byte == b"":
# if we didn't read a byte we must be at the end of the file
if bytes_read == 0:
if reading_header_comments:
check_required_header_comments()
break
elif byte in b"\r\n":
# if we read a line ending character, ignore it and parse what
Expand Down Expand Up @@ -365,8 +372,6 @@ def _read_comment(s: str) -> bool:
trailer_reached = True
bytes_read = 0

check_required_header_comments()

if not self._size:
msg = "cannot determine EPS bounding box"
raise OSError(msg)
Expand Down
Loading