]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-107396: tarfiles: set self.exception before _init_read_gz() (GH-107485)
authorbalmeida-nokia <83089745+balmeida-nokia@users.noreply.github.com>
Mon, 21 Aug 2023 11:39:06 +0000 (12:39 +0100)
committerGitHub <noreply@github.com>
Mon, 21 Aug 2023 11:39:06 +0000 (11:39 +0000)
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().

Lib/tarfile.py
Lib/test/test_tarfile.py
Misc/NEWS.d/next/Library/2023-07-31-07-36-24.gh-issue-107396.3_Kh6D.rst [new file with mode: 0644]

index 1147d59d3d5104191456ffe3b216979d4575eabb..a835d00c90c92c7cf70c17f387c8b334213037e2 100755 (executable)
@@ -372,8 +372,8 @@ class _Stream:
                 self.zlib = zlib
                 self.crc = zlib.crc32(b"")
                 if mode == "r":
-                    self._init_read_gz()
                     self.exception = zlib.error
+                    self._init_read_gz()
                 else:
                     self._init_write_gz(compresslevel)
 
index 2cdf2c1fc2f2978d5f871de4a8a618c17b85fd89..0d6ca4315cfda4f1e465bbd82288a8651056cb6f 100644 (file)
@@ -938,6 +938,23 @@ class LzmaDetectReadTest(LzmaTest, DetectReadTest):
     pass
 
 
+class GzipBrokenHeaderCorrectException(GzipTest, unittest.TestCase):
+    """
+    See: https://github.com/python/cpython/issues/107396
+    """
+    def runTest(self):
+        f = io.BytesIO(
+            b'\x1f\x8b'  # header
+            b'\x08'  # compression method
+            b'\x04'  # flags
+            b'\0\0\0\0\0\0'  # timestamp, compression data, OS ID
+            b'\0\x01'  # size
+            b'\0\0\0\0\0'  # corrupt data (zeros)
+        )
+        with self.assertRaises(tarfile.ReadError):
+            tarfile.open(fileobj=f, mode='r|gz')
+
+
 class MemberReadTest(ReadTest, unittest.TestCase):
 
     def _test_member(self, tarinfo, chksum=None, **kwargs):
diff --git a/Misc/NEWS.d/next/Library/2023-07-31-07-36-24.gh-issue-107396.3_Kh6D.rst b/Misc/NEWS.d/next/Library/2023-07-31-07-36-24.gh-issue-107396.3_Kh6D.rst
new file mode 100644 (file)
index 0000000..73bff4b
--- /dev/null
@@ -0,0 +1 @@
+tarfiles; Fixed use before assignment of self.exception for gzip decompression