traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#15546: Fix GzipFile.peek()'s handling of pathological input data. 

This is a backport of changeset 8c07ff7f882f.
This commit is contained in:
Serhiy Storchaka 2013-01-22 15:54:48 +02:00
parent f186911e24
commit fc6e8aabf5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/gzip.py
View File

@ -367,8 +367,10 @@ class GzipFile(io.BufferedIOBase):
if self.fileobj is None: if self.fileobj is None:
return b'' return b''
try: try:
# 1024 is the same buffering heuristic used in read() # Ensure that we don't return b"" if we haven't reached EOF.
self._read(max(n, 1024)) while self.extrasize == 0:
# 1024 is the same buffering heuristic used in read()
self._read(max(n, 1024))
except EOFError: except EOFError:
pass pass
offset = self.offset - self.extrastart offset = self.offset - self.extrastart

3
Misc/NEWS
View File

@ -466,6 +466,9 @@ Library
- Issue #15424: Add a __sizeof__ implementation for array objects. - Issue #15424: Add a __sizeof__ implementation for array objects.
Patch by Ludwig Hähne. Patch by Ludwig Hähne.
- Issue #15546: Fix handling of pathological input data in the peek() method
of the GzipFile class.
- Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog - Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog
ended with '\'. Patch by Roger Serwy. ended with '\'. Patch by Roger Serwy.