Skip to content

Commit 3edcc34

Browse files
authored
gh-129813: Use PyBytesWriter in ctypes (#162260)
1 parent 9f205da commit 3edcc34

1 file changed

Lines changed: 12 additions & 17 deletions

File tree

‎Modules/_ctypes/_ctypes.c‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5154,7 +5154,6 @@ Array_subscript_impl(PyObject *myself, PyObject *item)
51545154

51555155
if (iteminfo->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
51565156
char *ptr = (char *)self->b_ptr;
5157-
char *dest;
51585157

51595158
if (slicelen <= 0)
51605159
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
@@ -5164,19 +5163,17 @@ Array_subscript_impl(PyObject *myself, PyObject *item)
51645163
slicelen);
51655164
return res;
51665165
}
5167-
dest = (char *)PyMem_Malloc(slicelen);
5168-
5169-
if (dest == NULL)
5170-
return PyErr_NoMemory();
5171-
5166+
PyBytesWriter *writer = PyBytesWriter_Create(slicelen);
5167+
if (writer == NULL) {
5168+
return NULL;
5169+
}
5170+
char *dest = PyBytesWriter_GetData(writer);
51725171
for (cur = start, i = 0; i < slicelen;
51735172
cur += step, i++) {
51745173
dest[i] = ptr[cur];
51755174
}
51765175

5177-
np = PyBytes_FromStringAndSize(dest, slicelen);
5178-
PyMem_Free(dest);
5179-
return np;
5176+
return PyBytesWriter_Finish(writer);
51805177
}
51815178
if (iteminfo->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
51825179
wchar_t *ptr = (wchar_t *)self->b_ptr;
@@ -5964,8 +5961,6 @@ Pointer_subscript(PyObject *myself, PyObject *item)
59645961
}
59655962
assert(iteminfo);
59665963
if (iteminfo->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
5967-
char *dest;
5968-
59695964
if (len <= 0)
59705965
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
59715966
if (step == 1) {
@@ -5977,18 +5972,18 @@ Pointer_subscript(PyObject *myself, PyObject *item)
59775972
Py_END_CRITICAL_SECTION();
59785973
return res;
59795974
}
5980-
dest = (char *)PyMem_Malloc(len);
5981-
if (dest == NULL)
5982-
return PyErr_NoMemory();
5975+
PyBytesWriter *writer = PyBytesWriter_Create(len);
5976+
if (writer == NULL) {
5977+
return NULL;
5978+
}
5979+
char *dest = PyBytesWriter_GetData(writer);
59835980
Py_BEGIN_CRITICAL_SECTION(self);
59845981
char *ptr = *(void **)self->b_ptr;
59855982
for (cur = start, i = 0; i < len; cur += step, i++) {
59865983
dest[i] = ptr[cur];
59875984
}
59885985
Py_END_CRITICAL_SECTION();
5989-
np = PyBytes_FromStringAndSize(dest, len);
5990-
PyMem_Free(dest);
5991-
return np;
5986+
return PyBytesWriter_Finish(writer);
59925987
}
59935988
if (iteminfo->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
59945989
wchar_t *dest;

0 commit comments

Comments
 (0)