python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-04 21:50:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use SAFEBLOCK instead of arbitrary large number

Browse Source
This commit is contained in:
Andrew Murray 2022-03-16 21:23:29 +11:00
parent 0d5a2d2b83
commit e3b53dc7e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PIL/PpmImagePlugin.py
View File

@ -141,7 +141,7 @@ class PpmPlainDecoder(ImageFile.PyDecoder):
_pulls_fd = True _pulls_fd = True
def _read_block(self): def _read_block(self):
return self.fd.read(10**6) return self.fd.read(ImageFile.SAFEBLOCK)
def _find_comment_end(self, block, start=0): def _find_comment_end(self, block, start=0):
a = block.find(b"\n", start) a = block.find(b"\n", start)
@ -186,8 +186,8 @@ class PpmPlainDecoder(ImageFile.PyDecoder):
while block and comment_spans: while block and comment_spans:
comment_end = self._find_comment_end(block) comment_end = self._find_comment_end(block)
if comment_end != -1: # comment ends in this block if comment_end != -1: # comment ends in this block
comment_spans = False
block = block[comment_end + 1 :] # delete tail of previous comment block = block[comment_end + 1 :] # delete tail of previous comment
comment_spans = False
else: # comment spans whole block else: # comment spans whole block
block = self._read_block() block = self._read_block()