mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-24 15:36:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Close #17666: Fix reading gzip files with an extra field.

Browse source
This commit is contained in:
Serhiy Storchaka 2013-04-08 22:35:02 +03:00
parent cf86d9441e
commit a6df938fef
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/gzip.py
View file

@ -280,7 +280,8 @@ class GzipFile(io.BufferedIOBase):
if flag & FEXTRA:
# Read & discard the extra field, if present
self._read_exact(struct.unpack("<H", self._read_exact(2)))
extra_len, = struct.unpack("<H", self._read_exact(2))
self._read_exact(extra_len)
if flag & FNAME:
# Read and discard a null-terminated string containing the filename
while True:

7
Lib/test/test_gzip.py
View file

@ -379,6 +379,13 @@ class TestGzip(unittest.TestCase):
with gzip.GzipFile(fileobj=io.BytesIO(truncated[:i])) as f:
self.assertRaises(EOFError, f.read, 1)
def test_read_with_extra(self):
# Gzip data with an extra field
gzdata = (b'\x1f\x8b\x08\x04\xb2\x17cQ\x02\xff'
b'\x05\x00Extra'
b'\x0bI-.\x01\x002\xd1Mx\x04\x00\x00\x00')
with gzip.GzipFile(fileobj=io.BytesIO(gzdata)) as f:
self.assertEqual(f.read(), b'Test')
def test_main(verbose=None):
support.run_unittest(TestGzip)