python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-22 20:09:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correctly check magic number

Browse Source
This commit is contained in:
Piolie 2021-01-04 01:49:19 -03:00
parent 699afe1e89
commit d2ad27d70a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/PIL/PpmImagePlugin.py
View File

@ -49,6 +49,16 @@ class PpmImageFile(ImageFile.ImageFile):
format = "PPM" format = "PPM"
format_description = "Pbmplus image" format_description = "Pbmplus image"
def _read_magic(self, s=b""):
while True: # read until next whitespace
c = self.fp.read(1)
if c in B_WHITESPACE:
break
s = s + c
if len(s) > 6: # exceeded max magic number length
break
return s
def _read_token(self, token=b""): def _read_token(self, token=b""):
def _ignore_comment(): # ignores rest of the line; stops at CR, LF or EOF def _ignore_comment(): # ignores rest of the line; stops at CR, LF or EOF
while True: while True:
@ -80,9 +90,11 @@ class PpmImageFile(ImageFile.ImageFile):
return token return token
def _open(self): def _open(self):
P = self.fp.read(1) magic_number = self._read_magic()
magic_number = self._read_token(P) try:
mode = MODES[magic_number] mode = MODES[magic_number]
except KeyError:
raise SyntaxError("Not a PPM image file") from None
self.custom_mimetype = { self.custom_mimetype = {
b"P4": "image/x-portable-bitmap", b"P4": "image/x-portable-bitmap",