#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

View File

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

View File

@ -466,6 +466,9 @@ Library
- Issue #15424: Add a __sizeof__ implementation for array objects.
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
ended with '\'. Patch by Roger Serwy.