https://github.com/python/cpython/commit/dcd28b5c35dda8e2cb7c5f66450f2aff0948c001
commit: dcd28b5c35dda8e2cb7c5f66450f2aff0948c001
branch: main
author: Erlend E. Aasland <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-01-26T10:11:35Z
summary:
gh-114569: Use PyMem_* APIs for most non-PyObject uses (#114574)
Fix usage in Modules, Objects, and Parser subdirectories.
files:
M Modules/_elementtree.c
M Modules/_sre/sre_lib.h
M Modules/mathmodule.c
M Modules/pyexpat.c
M Objects/bytearrayobject.c
M Objects/typeobject.c
M Parser/lexer/lexer.c
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index b574c96d3f9625..54451081211654 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -267,7 +267,7 @@ typedef struct {
LOCAL(int)
create_extra(ElementObject* self, PyObject* attrib)
{
- self->extra = PyObject_Malloc(sizeof(ElementObjectExtra));
+ self->extra = PyMem_Malloc(sizeof(ElementObjectExtra));
if (!self->extra) {
PyErr_NoMemory();
return -1;
@@ -295,10 +295,11 @@ dealloc_extra(ElementObjectExtra *extra)
for (i = 0; i < extra->length; i++)
Py_DECREF(extra->children[i]);
- if (extra->children != extra->_children)
- PyObject_Free(extra->children);
+ if (extra->children != extra->_children) {
+ PyMem_Free(extra->children);
+ }
- PyObject_Free(extra);
+ PyMem_Free(extra);
}
LOCAL(void)
@@ -495,14 +496,16 @@ element_resize(ElementObject* self, Py_ssize_t extra)
* "children", which needs at least 4 bytes. Although it's a
* false alarm always assume at least one child to be safe.
*/
- children = PyObject_Realloc(self->extra->children,
- size * sizeof(PyObject*));
- if (!children)
+ children = PyMem_Realloc(self->extra->children,
+ size * sizeof(PyObject*));
+ if (!children) {
goto nomemory;
+ }
} else {
- children = PyObject_Malloc(size * sizeof(PyObject*));
- if (!children)
+ children = PyMem_Malloc(size * sizeof(PyObject*));
+ if (!children) {
goto nomemory;
+ }
/* copy existing children from static area to malloc buffer */
memcpy(children, self->extra->children,
self->extra->length * sizeof(PyObject*));
@@ -3044,7 +3047,7 @@ _elementtree_TreeBuilder_start_impl(TreeBuilderObject
*self, PyObject *tag,
#define EXPAT(st, func) ((st)->expat_capi->func)
static XML_Memory_Handling_Suite ExpatMemoryHandler = {
- PyObject_Malloc, PyObject_Realloc, PyObject_Free};
+ PyMem_Malloc, PyMem_Realloc, PyMem_Free};
typedef struct {
PyObject_HEAD
diff --git a/Modules/_sre/sre_lib.h b/Modules/_sre/sre_lib.h
index f5497d9ff2b93f..97fbb0a75e54b6 100644
--- a/Modules/_sre/sre_lib.h
+++ b/Modules/_sre/sre_lib.h
@@ -1122,7 +1122,7 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int
toplevel)
/* install new repeat context */
/* TODO(https://github.com/python/cpython/issues/67877): Fix this
* potential memory leak. */
- ctx->u.rep = (SRE_REPEAT*) PyObject_Malloc(sizeof(*ctx->u.rep));
+ ctx->u.rep = (SRE_REPEAT*) PyMem_Malloc(sizeof(*ctx->u.rep));
if (!ctx->u.rep) {
PyErr_NoMemory();
RETURN_FAILURE;
@@ -1136,7 +1136,7 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int
toplevel)
state->ptr = ptr;
DO_JUMP(JUMP_REPEAT, jump_repeat, pattern+pattern[0]);
state->repeat = ctx->u.rep->prev;
- PyObject_Free(ctx->u.rep);
+ PyMem_Free(ctx->u.rep);
if (ret) {
RETURN_ON_ERROR(ret);
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
index 2a796c1c55d2f0..0be46b1574c1fe 100644
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -2570,7 +2570,7 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q)
goto error_exit;
}
if (n > NUM_STACK_ELEMS) {
- diffs = (double *) PyObject_Malloc(n * sizeof(double));
+ diffs = (double *) PyMem_Malloc(n * sizeof(double));
if (diffs == NULL) {
PyErr_NoMemory();
goto error_exit;
@@ -2590,7 +2590,7 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q)
}
result = vector_norm(n, diffs, max, found_nan);
if (diffs != diffs_on_stack) {
- PyObject_Free(diffs);
+ PyMem_Free(diffs);
}
if (p_allocated) {
Py_DECREF(p);
@@ -2602,7 +2602,7 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q)
error_exit:
if (diffs != diffs_on_stack) {
- PyObject_Free(diffs);
+ PyMem_Free(diffs);
}
if (p_allocated) {
Py_DECREF(p);
@@ -2626,7 +2626,7 @@ math_hypot(PyObject *self, PyObject *const *args,
Py_ssize_t nargs)
double *coordinates = coord_on_stack;
if (nargs > NUM_STACK_ELEMS) {
- coordinates = (double *) PyObject_Malloc(nargs * sizeof(double));
+ coordinates = (double *) PyMem_Malloc(nargs * sizeof(double));
if (coordinates == NULL) {
return PyErr_NoMemory();
}
@@ -2643,13 +2643,13 @@ math_hypot(PyObject *self, PyObject *const *args,
Py_ssize_t nargs)
}
result = vector_norm(nargs, coordinates, max, found_nan);
if (coordinates != coord_on_stack) {
- PyObject_Free(coordinates);
+ PyMem_Free(coordinates);
}
return PyFloat_FromDouble(result);
error_exit:
if (coordinates != coord_on_stack) {
- PyObject_Free(coordinates);
+ PyMem_Free(coordinates);
}
return NULL;
}
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index ec44892d101e44..7c08eda83e66b2 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -21,7 +21,7 @@ module pyexpat
#define XML_COMBINED_VERSION
(10000*XML_MAJOR_VERSION+100*XML_MINOR_VERSION+XML_MICRO_VERSION)
static XML_Memory_Handling_Suite ExpatMemoryHandler = {
- PyObject_Malloc, PyObject_Realloc, PyObject_Free};
+ PyMem_Malloc, PyMem_Realloc, PyMem_Free};
enum HandlerTypes {
StartElement,
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 659de7d3dd5a99..acc59b926448ca 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -132,7 +132,7 @@ PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t
size)
}
else {
alloc = size + 1;
- new->ob_bytes = PyObject_Malloc(alloc);
+ new->ob_bytes = PyMem_Malloc(alloc);
if (new->ob_bytes == NULL) {
Py_DECREF(new);
return PyErr_NoMemory();
@@ -221,17 +221,17 @@ PyByteArray_Resize(PyObject *self, Py_ssize_t
requested_size)
}
if (logical_offset > 0) {
- sval = PyObject_Malloc(alloc);
+ sval = PyMem_Malloc(alloc);
if (sval == NULL) {
PyErr_NoMemory();
return -1;
}
memcpy(sval, PyByteArray_AS_STRING(self),
Py_MIN((size_t)requested_size, (size_t)Py_SIZE(self)));
- PyObject_Free(obj->ob_bytes);
+ PyMem_Free(obj->ob_bytes);
}
else {
- sval = PyObject_Realloc(obj->ob_bytes, alloc);
+ sval = PyMem_Realloc(obj->ob_bytes, alloc);
if (sval == NULL) {
PyErr_NoMemory();
return -1;
@@ -951,7 +951,7 @@ bytearray_repr(PyByteArrayObject *self)
}
newsize += 6 + length * 4;
- buffer = PyObject_Malloc(newsize);
+ buffer = PyMem_Malloc(newsize);
if (buffer == NULL) {
PyErr_NoMemory();
return NULL;
@@ -1008,7 +1008,7 @@ bytearray_repr(PyByteArrayObject *self)
}
v = PyUnicode_FromStringAndSize(buffer, p - buffer);
- PyObject_Free(buffer);
+ PyMem_Free(buffer);
return v;
}
@@ -1088,7 +1088,7 @@ bytearray_dealloc(PyByteArrayObject *self)
PyErr_Print();
}
if (self->ob_bytes != 0) {
- PyObject_Free(self->ob_bytes);
+ PyMem_Free(self->ob_bytes);
}
Py_TYPE(self)->tp_free((PyObject *)self);
}
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index a8c3b8896d36eb..114cf21f95e744 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3493,7 +3493,7 @@ type_new_set_doc(PyTypeObject *type)
// Silently truncate the docstring if it contains a null byte
Py_ssize_t size = strlen(doc_str) + 1;
- char *tp_doc = (char *)PyObject_Malloc(size);
+ char *tp_doc = (char *)PyMem_Malloc(size);
if (tp_doc == NULL) {
PyErr_NoMemory();
return -1;
@@ -4166,12 +4166,12 @@ _PyType_FromMetaclass_impl(
goto finally;
}
if (slot->pfunc == NULL) {
- PyObject_Free(tp_doc);
+ PyMem_Free(tp_doc);
tp_doc = NULL;
}
else {
size_t len = strlen(slot->pfunc)+1;
- tp_doc = PyObject_Malloc(len);
+ tp_doc = PyMem_Malloc(len);
if (tp_doc == NULL) {
PyErr_NoMemory();
goto finally;
@@ -4501,7 +4501,7 @@ _PyType_FromMetaclass_impl(
Py_CLEAR(res);
}
Py_XDECREF(bases);
- PyObject_Free(tp_doc);
+ PyMem_Free(tp_doc);
Py_XDECREF(ht_name);
PyMem_Free(_ht_tpname);
return (PyObject*)res;
@@ -5099,7 +5099,7 @@ type_dealloc(PyObject *self)
/* A type's tp_doc is heap allocated, unlike the tp_doc slots
* of most other objects. It's okay to cast it to char *.
*/
- PyObject_Free((char *)type->tp_doc);
+ PyMem_Free((char *)type->tp_doc);
PyHeapTypeObject *et = (PyHeapTypeObject *)type;
Py_XDECREF(et->ht_name);
diff --git a/Parser/lexer/lexer.c b/Parser/lexer/lexer.c
index ebf7686773ff45..82b0e4ee352d62 100644
--- a/Parser/lexer/lexer.c
+++ b/Parser/lexer/lexer.c
@@ -129,7 +129,7 @@ set_fstring_expr(struct tok_state* tok, struct token
*token, char c) {
if (hash_detected) {
Py_ssize_t input_length = tok_mode->last_expr_size -
tok_mode->last_expr_end;
- char *result = (char *)PyObject_Malloc((input_length + 1) *
sizeof(char));
+ char *result = (char *)PyMem_Malloc((input_length + 1) * sizeof(char));
if (!result) {
return -1;
}
@@ -154,7 +154,7 @@ set_fstring_expr(struct tok_state* tok, struct token
*token, char c) {
result[j] = '\0'; // Null-terminate the result string
res = PyUnicode_DecodeUTF8(result, j, NULL);
- PyObject_Free(result);
+ PyMem_Free(result);
} else {
res = PyUnicode_DecodeUTF8(
tok_mode->last_expr_buffer,
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
