Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-06-28 11:50:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.15] gh-150599: Prevent bz2 decompressor reuse after errors (GH-150600)

Browse source 
(cherry picked from commit 5755d0f083)

Co-authored-by: Stan Ulbrych <stan@python.org>
This commit is contained in:
Miss Islington (bot) 2026-06-07 18:48:30 +02:00 • committed by GitHub
parent a642d1ab38
commit d3ca26983d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Modules/_bz2module.c
View file

@ -108,6 +108,7 @@ typedef struct {
typedef struct {
PyObject_HEAD
bz_stream bzs;
int bzerror;
char eof; /* Py_T_BOOL expects a char */
PyObject *unused_data;
char needs_input;
@ -435,8 +436,11 @@ decompress_buf(BZ2Decompressor *d, Py_ssize_t max_length)
d->bzs_avail_in_real += bzs->avail_in;
if (catch_bz2_error(bzret))
if (catch_bz2_error(bzret)) {
d->bzerror = bzret;
FT_ATOMIC_STORE_CHAR_RELAXED(d->needs_input, 0);
goto error;
}
if (bzret == BZ_STREAM_END) {
FT_ATOMIC_STORE_CHAR_RELAXED(d->eof, 1);
break;
@ -607,10 +611,17 @@ _bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data,
PyObject *result = NULL;
PyMutex_Lock(&self->mutex);
if (self->eof)
if (self->eof) {
PyErr_SetString(PyExc_EOFError, "End of stream already reached");
else
}
else if (self->bzerror) {
// Re-entering BZ2_bzDecompress() after an error can write out of bounds.
PyErr_SetString(PyExc_ValueError,
"Decompressor is unusable after a previous error");
}
else {
result = decompress(self, data->buf, data->len, max_length);
}
PyMutex_Unlock(&self->mutex);
return result;
}
@ -638,6 +649,7 @@ _bz2_BZ2Decompressor_impl(PyTypeObject *type)
}
self->mutex = (PyMutex){0};
self->bzerror = 0;
self->needs_input = 1;
self->bzs_avail_in_real = 0;
self->input_buffer = NULL;