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 1ff249965692aedbfd0af2c50138636416b532bd..0086c13d3c1419a5ce9d1574b857d6199d6d2c64 100644 (file)
--- 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 ff2ead68fa89f58d4b3c418f7d5a607debd2d48e..713294c4c27685a18fe594e0223b202dc1693d78 100644 (file)
--- 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