rearrange methodcaller_new so that the main error case does not cause uninitialized memory usage (closes #27783)
diff --git a/Modules/operator.c b/Modules/operator.c
index ae060b8..7ddd123 100644
--- a/Modules/operator.c
+++ b/Modules/operator.c
@@ -788,7 +788,7 @@
methodcaller_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
methodcallerobject *mc;
- PyObject *name, *newargs;
+ PyObject *name;
if (PyTuple_GET_SIZE(args) < 1) {
PyErr_SetString(PyExc_TypeError, "methodcaller needs at least "
@@ -801,13 +801,6 @@
if (mc == NULL)
return NULL;
- newargs = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
- if (newargs == NULL) {
- Py_DECREF(mc);
- return NULL;
- }
- mc->args = newargs;
-
name = PyTuple_GET_ITEM(args, 0);
Py_INCREF(name);
mc->name = name;
@@ -815,6 +808,12 @@
Py_XINCREF(kwds);
mc->kwds = kwds;
+ mc->args = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
+ if (mc->args == NULL) {
+ Py_DECREF(mc);
+ return NULL;
+ }
+
PyObject_GC_Track(mc);
return (PyObject *)mc;
}