From fc6e8aabf58d748369e0d3b08495ac35a67d2870 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 22 Jan 2013 15:54:48 +0200 Subject: #15546: Fix GzipFile.peek()'s handling of pathological input data. This is a backport of changeset 8c07ff7f882f. --- Lib/gzip.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Lib/gzip.py') diff --git a/Lib/gzip.py b/Lib/gzip.py index 403040bd9c..6aacc9a4f9 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -367,8 +367,10 @@ class GzipFile(io.BufferedIOBase): if self.fileobj is None: return b'' try: - # 1024 is the same buffering heuristic used in read() - self._read(max(n, 1024)) + # 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: pass offset = self.offset - self.extrastart -- cgit v1.2.1