From 320dcf4ef15de14eb0f8b10f3677676bc7020ce9 Mon Sep 17 00:00:00 2001 From: FFspiky Date: Mon, 16 Nov 2026 09:03:29 +0800 Subject: [PATCH] Release input buffers when writing to closed streams --- c-ext/compressionwriter.c | 2 +- c-ext/decompressionwriter.c | 2 +- tests/test_compressor_stream_writer.py | 12 ++++++++++++ tests/test_decompressor_stream_writer.py | 12 ++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/c-ext/compressionwriter.c b/c-ext/compressionwriter.c index c7490713..d644c6de 100644 --- a/c-ext/compressionwriter.c +++ b/c-ext/compressionwriter.c @@ -82,7 +82,7 @@ static PyObject *ZstdCompressionWriter_write(ZstdCompressionWriter *self, if (self->closed) { PyErr_SetString(PyExc_ValueError, "stream is closed"); - return NULL; + goto finally; } self->output.pos = 0; diff --git a/c-ext/decompressionwriter.c b/c-ext/decompressionwriter.c index 71a148be..f0a4b927 100644 --- a/c-ext/decompressionwriter.c +++ b/c-ext/decompressionwriter.c @@ -70,7 +70,7 @@ static PyObject *ZstdDecompressionWriter_write(ZstdDecompressionWriter *self, if (self->closed) { PyErr_SetString(PyExc_ValueError, "stream is closed"); - return NULL; + goto finally; } output.dst = PyMem_Malloc(self->outSize); diff --git a/tests/test_compressor_stream_writer.py b/tests/test_compressor_stream_writer.py index 1f1855fc..c28c7d23 100644 --- a/tests/test_compressor_stream_writer.py +++ b/tests/test_compressor_stream_writer.py @@ -14,6 +14,18 @@ class TestCompressor_stream_writer(unittest.TestCase): + def test_closed_write_releases_buffer(self): + ctx = zstd.ZstdCompressor() + writer = ctx.stream_writer(io.BytesIO()) + writer.close() + + for data in (bytearray(), bytearray(b"foo")): + with self.subTest(data=data): + for _ in range(2): + with self.assertRaisesRegex(ValueError, "stream is closed"): + writer.write(data) + data.extend(b"bar") + def test_io_api(self): buffer = io.BytesIO() cctx = zstd.ZstdCompressor() diff --git a/tests/test_decompressor_stream_writer.py b/tests/test_decompressor_stream_writer.py index e624a16e..c7b6c8aa 100644 --- a/tests/test_decompressor_stream_writer.py +++ b/tests/test_decompressor_stream_writer.py @@ -22,6 +22,18 @@ def decompress_via_writer(data): class TestDecompressor_stream_writer(unittest.TestCase): + def test_closed_write_releases_buffer(self): + ctx = zstd.ZstdDecompressor() + writer = ctx.stream_writer(io.BytesIO()) + writer.close() + + for data in (bytearray(), bytearray(b"foo")): + with self.subTest(data=data): + for _ in range(2): + with self.assertRaisesRegex(ValueError, "stream is closed"): + writer.write(data) + data.extend(b"bar") + def test_io_api(self): buffer = io.BytesIO() dctx = zstd.ZstdDecompressor()