Skip to content

[3.10] gh-156002: Bound zipfile decompression for bzip2/LZMA/Zstandard (GH-156003) (GH-156362) #156741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogsal merged 5 commits into from
Oct 1, 2026
Merged

[3.10] gh-156002: Bound zipfile decompression for bzip2/LZMA/Zstandard (GH-156003) (GH-156362) #156741

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e116414
[3.15] gh-156002: Bound zipfile decompression for bzip2/LZMA/Zstandar…
encukou Aug 31, 2026
3696a46
Remove zstd test (3.14+)
encukou Sep 3, 2026
c6b8aab
gh-156002: Keep reading through monkey-patched zipfile decompressors …
miss-islington Sep 16, 2026
14bfd82
Avoid unittest's enterContext; it doesn't exist yet
encukou Sep 16, 2026
42b6c97
Don't use the :cve: RST role, it doesn't exist yet
encukou Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Avoid unittest's enterContext; it doesn't exist yet
  • Loading branch information
@encukou
encukou committed Sep 16, 2026
commit 14bfd82b3aae6218263d3f4057d292f64200a247
45 changes: 21 additions & 24 deletions Lib/test/test_zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2258,7 +2258,7 @@ class Decompressor:
def decompress(self, data):
return data.swapcase()

def setUp(self):
def test_roundtrip_monkeypatched_decompressor(self):
orig_check_compression = zipfile._check_compression
orig_get_compressor = zipfile._get_compressor
orig_get_decompressor = zipfile._get_decompressor
Expand All @@ -2277,29 +2277,26 @@ def get_decompressor(compress_type):
return self.Decompressor()
return orig_get_decompressor(compress_type)

self.enterContext(mock.patch.object(
zipfile, '_check_compression', check_compression))
self.enterContext(mock.patch.object(
zipfile, '_get_compressor', get_compressor))
self.enterContext(mock.patch.object(
zipfile, '_get_decompressor', get_decompressor))

def test_roundtrip_monkeypatched_decompressor(self):
data = bytes(range(256)) * 8
buf = io.BytesIO()
with zipfile.ZipFile(buf, "w", compression=self.COMPRESSION) as zf:
zf.writestr("member", data)
self.assertIn(data.swapcase(), buf.getvalue())
with zipfile.ZipFile(io.BytesIO(buf.getvalue())) as zf:
self.assertEqual(zf.read("member"), data)
with zf.open("member") as f:
self.assertEqual(f.read(100), data[:100])
self.assertEqual(f.read1(100), data[100:200])
f.seek(-100, os.SEEK_END)
self.assertEqual(f.read(), data[-100:])
# Rewinding past the read buffer re-creates the decompressor.
f.seek(0)
self.assertEqual(f.read(), data)
with (
mock.patch.object(zipfile, '_check_compression', check_compression),
mock.patch.object(zipfile, '_get_compressor', get_compressor),
mock.patch.object(zipfile, '_get_decompressor', get_decompressor),
):
data = bytes(range(256)) * 8
buf = io.BytesIO()
with zipfile.ZipFile(buf, "w", compression=self.COMPRESSION) as zf:
zf.writestr("member", data)
self.assertIn(data.swapcase(), buf.getvalue())
with zipfile.ZipFile(io.BytesIO(buf.getvalue())) as zf:
self.assertEqual(zf.read("member"), data)
with zf.open("member") as f:
self.assertEqual(f.read(100), data[:100])
self.assertEqual(f.read1(100), data[100:200])
f.seek(-100, os.SEEK_END)
self.assertEqual(f.read(), data[-100:])
# Rewinding past the read buffer re-creates the decompressor.
f.seek(0)
self.assertEqual(f.read(), data)


class AbstractBadCrcTests:
Expand Down
Loading