mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

#2016 Fix a crash in function call when the **kwargs dictionary is mutated

Browse source 
during the function call setup.

This even gives a slight speedup, probably because tuple allocation
is faster than PyMem_NEW.
This commit is contained in:
Amaury Forgeot d'Arc 2009-06-25 22:29:29 +00:00
parent ca69bb90cb
commit 595f7a5bf9
3 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Objects/funcobject.c
View file

@ -489,13 +489,14 @@ function_call(PyObject *func, PyObject *arg, PyObject *kw)
{
PyObject *result;
PyObject *argdefs;
PyObject *kwtuple = NULL;
PyObject **d, **k;
Py_ssize_t nk, nd;
argdefs = PyFunction_GET_DEFAULTS(func);
if (argdefs != NULL && PyTuple_Check(argdefs)) {
d = &PyTuple_GET_ITEM((PyTupleObject *)argdefs, 0);
nd = PyTuple_Size(argdefs);
nd = PyTuple_GET_SIZE(argdefs);
}
else {
d = NULL;
@ -505,16 +506,17 @@ function_call(PyObject *func, PyObject *arg, PyObject *kw)
if (kw != NULL && PyDict_Check(kw)) {
Py_ssize_t pos, i;
nk = PyDict_Size(kw);
k = PyMem_NEW(PyObject *, 2*nk);
if (k == NULL) {
PyErr_NoMemory();
kwtuple = PyTuple_New(2*nk);
if (kwtuple == NULL)
return NULL;
}
k = &PyTuple_GET_ITEM(kwtuple, 0);
pos = i = 0;
while (PyDict_Next(kw, &pos, &k[i], &k[i+1]))
while (PyDict_Next(kw, &pos, &k[i], &k[i+1])) {
Py_INCREF(k[i]);
Py_INCREF(k[i+1]);
i += 2;
}
nk = i/2;
/* XXX This is broken if the caller deletes dict items! */
}
else {
k = NULL;
@ -524,12 +526,11 @@ function_call(PyObject *func, PyObject *arg, PyObject *kw)
result = PyEval_EvalCodeEx(
(PyCodeObject *)PyFunction_GET_CODE(func),
PyFunction_GET_GLOBALS(func), (PyObject *)NULL,
&PyTuple_GET_ITEM(arg, 0), PyTuple_Size(arg),
&PyTuple_GET_ITEM(arg, 0), PyTuple_GET_SIZE(arg),
k, nk, d, nd,
PyFunction_GET_CLOSURE(func));
if (k != NULL)
PyMem_DEL(k);
Py_XDECREF(kwtuple);
return result;
}