From 98d2b867f1e6e09ae9bbe40b1af5551ab82d22fc Mon Sep 17 00:00:00 2001 From: Rogdham Date: Fri, 9 May 2025 11:15:23 +0200 Subject: [PATCH] ZstdFile: don't allow trailer data --- Lib/compression/zstd/_zstdfile.py | 1 - Lib/test/test_zstd.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/compression/zstd/_zstdfile.py b/Lib/compression/zstd/_zstdfile.py index fbc9e02a733626..c88ba150d9ce26 100644 --- a/Lib/compression/zstd/_zstdfile.py +++ b/Lib/compression/zstd/_zstdfile.py @@ -91,7 +91,6 @@ def __init__(self, file, /, mode="r", *, 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 f4a25376e5234a..27e31e846346f9 100644 --- a/Lib/test/test_zstd.py +++ b/Lib/test/test_zstd.py @@ -1682,10 +1682,10 @@ def test_read_incomplete(self): # 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