From: Rogdham <3994389+Rogdham@users.noreply.github.com>
Date: Sat, 10 May 2025 02:32:22 +0000 (+0200)
Subject: gh-132983: Don't allow trailer data in ZstdFile (#133736)
X-Git-Tag: v3.15.0a1~1783
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50b53706646cc130dcc71496f4a5bee14e9a1d9a;p=thirdparty%2FPython%2Fcpython.git

gh-132983: Don't allow trailer data in ZstdFile (#133736)
---

diff --git a/Lib/compression/zstd/_zstdfile.py b/Lib/compression/zstd/_zstdfile.py
index 1ff249965692..0086c13d3c14 100644
--- a/Lib/compression/zstd/_zstdfile.py
+++ b/Lib/compression/zstd/_zstdfile.py
@@ -89,7 +89,6 @@ class ZstdFile(_streams.BaseStream):
             raw = _streams.DecompressReader(
                 self._fp,
                 ZstdDecompressor,
-                trailing_error=ZstdError,
                 zstd_dict=zstd_dict,
                 options=options,
             )
diff --git a/Lib/test/test_zstd.py b/Lib/test/test_zstd.py
index ff2ead68fa89..713294c4c276 100644
--- a/Lib/test/test_zstd.py
+++ b/Lib/test/test_zstd.py
@@ -1682,10 +1682,10 @@ class FileTestCase(unittest.TestCase):
 
         # Trailing data isn't a valid compressed stream
         with ZstdFile(io.BytesIO(self.FRAME_42 + b'12345')) as f:
-            self.assertEqual(f.read(), self.DECOMPRESSED_42)
+            self.assertRaises(ZstdError, f.read)
 
         with ZstdFile(io.BytesIO(SKIPPABLE_FRAME + b'12345')) as f:
-            self.assertEqual(f.read(), b'')
+            self.assertRaises(ZstdError, f.read)
 
     def test_read_truncated(self):
         # Drop stream epilogue: 4 bytes checksum