Skip to content

Commit 75617ac

Browse files
[3.11] gh-107396: tarfiles: set self.exception before _init_read_gz() (GH-107485) (GH-108208)
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(). (cherry picked from commit 37135d2) Co-authored-by: balmeida-nokia <[email protected]>
1 parent ed67e60 commit 75617ac

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

Lib/tarfile.py

Lines changed: 1 addition & 1 deletion
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()
379379

Lib/test/test_tarfile.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,23 @@ class LzmaDetectReadTest(LzmaTest, DetectReadTest):
908908
pass
909909

910910

911+
class GzipBrokenHeaderCorrectException(GzipTest, unittest.TestCase):
912+
"""
913+
See: https://github.com/python/cpython/issues/107396
914+
"""
915+
def runTest(self):
916+
f = io.BytesIO(
917+
b'\x1f\x8b' # header
918+
b'\x08' # compression method
919+
b'\x04' # flags
920+
b'\0\0\0\0\0\0' # timestamp, compression data, OS ID
921+
b'\0\x01' # size
922+
b'\0\0\0\0\0' # corrupt data (zeros)
923+
)
924+
with self.assertRaises(tarfile.ReadError):
925+
tarfile.open(fileobj=f, mode='r|gz')
926+
927+
911928
class MemberReadTest(ReadTest, unittest.TestCase):
912929

913930
def _test_member(self, tarinfo, chksum=None, **kwargs):
Lines changed: 1 addition & 0 deletions
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)