summaryrefslogtreecommitdiff
path: root/Modules/_operator.c
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2017-02-04 14:55:16 -0800
committerSteve Dower <steve.dower@microsoft.com>2017-02-04 14:55:16 -0800
commitb53654b6dbfce8318a7d4d1cdaddca7a7fec194b (patch)
tree204df61b2fb23424603db767732db35a687529c6 /Modules/_operator.c
parente1ac7d87afad9c07ec25e5705bb135b71347b581 (diff)
parent2296b978597ce62ec2185b78a43811610af2c0ea (diff)
downloadcpython-b53654b6dbfce8318a7d4d1cdaddca7a7fec194b.tar.gz
Issue #29416: Prevent infinite loop in pathlib.Path.mkdir
Diffstat (limited to 'Modules/_operator.c')
-rw-r--r--Modules/_operator.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/Modules/_operator.c b/Modules/_operator.c
index dfff1d2faa..fb8eafc679 100644
--- a/Modules/_operator.c
+++ b/Modules/_operator.c
@@ -1111,6 +1111,8 @@ methodcaller_reduce(methodcallerobject *mc)
PyObject *functools;
PyObject *partial;
PyObject *constructor;
+ PyObject *newargs[2];
+
_Py_IDENTIFIER(partial);
functools = PyImport_ImportModule("functools");
if (!functools)
@@ -1119,17 +1121,11 @@ methodcaller_reduce(methodcallerobject *mc)
Py_DECREF(functools);
if (!partial)
return NULL;
- newargs = PyTuple_New(2);
- if (newargs == NULL) {
- Py_DECREF(partial);
- return NULL;
- }
- Py_INCREF(Py_TYPE(mc));
- PyTuple_SET_ITEM(newargs, 0, (PyObject *)Py_TYPE(mc));
- Py_INCREF(mc->name);
- PyTuple_SET_ITEM(newargs, 1, mc->name);
- constructor = PyObject_Call(partial, newargs, mc->kwds);
- Py_DECREF(newargs);
+
+ newargs[0] = (PyObject *)Py_TYPE(mc);
+ newargs[1] = mc->name;
+ constructor = _PyObject_FastCallDict(partial, newargs, 2, mc->kwds);
+
Py_DECREF(partial);
return Py_BuildValue("NO", constructor, mc->args);
}