Skip to content

Commit 37135d2

Browse files
gh-107396: tarfiles: set self.exception before _init_read_gz() (GH-107485)
In the stack call of: _init_read_gz() ``` _read, tarfile.py:548 read, tarfile.py:526 _init_read_gz, tarfile.py:491 ``` a try;except exists that uses `self.exception`, so it needs to be set before calling _init_read_gz().
1 parent 80bdebd commit 37135d2

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

Lib/tarfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ def __init__(self, name, mode, comptype, fileobj, bufsize,
372372
self.zlib = zlib
373373
self.crc = zlib.crc32(b"")
374374
if mode == "r":
375-
self._init_read_gz()
376375
self.exception = zlib.error
376+
self._init_read_gz()
377377
else:
378378
self._init_write_gz(compresslevel)
379379

Lib/test/test_tarfile.py

+17
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,23 @@ class LzmaDetectReadTest(LzmaTest, DetectReadTest):
938938
pass
939939

940940

941+
class GzipBrokenHeaderCorrectException(GzipTest, unittest.TestCase):
942+
"""
943+
See: https://github.com/python/cpython/issues/107396
944+
"""
945+
def runTest(self):
946+
f = io.BytesIO(
947+
b'\x1f\x8b' # header
948+
b'\x08' # compression method
949+
b'\x04' # flags
950+
b'\0\0\0\0\0\0' # timestamp, compression data, OS ID
951+
b'\0\x01' # size
952+
b'\0\0\0\0\0' # corrupt data (zeros)
953+
)
954+
with self.assertRaises(tarfile.ReadError):
955+
tarfile.open(fileobj=f, mode='r|gz')
956+
957+
941958
class MemberReadTest(ReadTest, unittest.TestCase):
942959

943960
def _test_member(self, tarinfo, chksum=None, **kwargs):
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tarfiles; Fixed use before assignment of self.exception for gzip decompression

0 commit comments

Comments
 (0)