python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-21 13:39:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly check if magic number is empty

Browse Source
This commit is contained in:
Andrew Murray 2022-03-04 11:17:25 +11:00
parent 3426052874
commit f5b9e2c43a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PIL/PpmImagePlugin.py
View File

@ -52,7 +52,7 @@ class PpmImageFile(ImageFile.ImageFile):
def _read_magic(self, magic=b""): def _read_magic(self, magic=b""):
while True: # read until next whitespace while True: # read until next whitespace
c = self.fp.read(1) c = self.fp.read(1)
if c in b_whitespace: if not c or c in b_whitespace:
break break
magic += c magic += c
if len(magic) > 6: # exceeded max magic number length if len(magic) > 6: # exceeded max magic number length
@ -69,9 +69,9 @@ class PpmImageFile(ImageFile.ImageFile):
if c == b"#": # found comment, ignore it if c == b"#": # found comment, ignore it
_ignore_comment() _ignore_comment()
continue continue
if not c:
raise ValueError("Reached EOF while reading header")
if c in b_whitespace: # found whitespace, ignore it if c in b_whitespace: # found whitespace, ignore it
if c == b"": # reached EOF
raise ValueError("Reached EOF while reading header")
continue continue
break break