greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-129813, PEP 782: Use PyBytesWriter in lzma and zlib (#138832)

Browse Source 
Replace PyBytes_FromStringAndSize(NULL, size) with the new public
PyBytesWriter API.
This commit is contained in:
Victor Stinner
2025-09-13 19:27:04 +02:00
committed by GitHub
parent 430900d15b
commit 7168e98c80
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/_lzmamodule.c
View File

@@ -1442,7 +1442,7 @@ _lzma__encode_filter_properties_impl(PyObject *module, lzma_filter filter)
{
lzma_ret lzret;
uint32_t encoded_size;
PyObject *result = NULL;
PyBytesWriter *writer = NULL;
_lzma_state *state = get_lzma_state(module);
assert(state != NULL);
@@ -1450,20 +1450,20 @@ _lzma__encode_filter_properties_impl(PyObject *module, lzma_filter filter)
if (catch_lzma_error(state, lzret))
goto error;
result = PyBytes_FromStringAndSize(NULL, encoded_size);
if (result == NULL)
writer = PyBytesWriter_Create(encoded_size);
if (writer == NULL) {
goto error;
}
lzret = lzma_properties_encode(
&filter, (uint8_t *)PyBytes_AS_STRING(result));
lzret = lzma_properties_encode(&filter, PyBytesWriter_GetData(writer));
if (catch_lzma_error(state, lzret)) {
goto error;
}
return result;
return PyBytesWriter_Finish(writer);
error:
Py_XDECREF(result);
PyBytesWriter_Discard(writer);
return NULL;
}

22
Modules/zlibmodule.c
View File

@@ -833,22 +833,24 @@ save_unconsumed_input(compobject *self, Py_buffer *data, int err)
input data in self->unused_data. */
if (self->zst.avail_in > 0) {
Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
Py_ssize_t new_size, left_size;
PyObject *new_data;
Py_ssize_t left_size;
left_size = (Byte *)data->buf + data->len - self->zst.next_in;
if (left_size > (PY_SSIZE_T_MAX - old_size)) {
PyErr_NoMemory();
return -1;
}
new_size = old_size + left_size;
new_data = PyBytes_FromStringAndSize(NULL, new_size);
if (new_data == NULL)
PyBytesWriter *writer = PyBytesWriter_Create(old_size + left_size);
if (writer == NULL) {
return -1;
memcpy(PyBytes_AS_STRING(new_data),
PyBytes_AS_STRING(self->unused_data), old_size);
memcpy(PyBytes_AS_STRING(new_data) + old_size,
self->zst.next_in, left_size);
Py_SETREF(self->unused_data, new_data);
}
char *new_data = PyBytesWriter_GetData(writer);
memcpy(new_data, PyBytes_AS_STRING(self->unused_data), old_size);
memcpy(new_data + old_size, self->zst.next_in, left_size);
PyObject *new_unused_data = PyBytesWriter_Finish(writer);
if (new_unused_data == NULL) {
return -1;
}
Py_SETREF(self->unused_data, new_unused_data);
self->zst.avail_in = 0;
}
}