traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ssue #27213: Reintroduce checks in _PyStack_AsDict()

This commit is contained in:
Victor Stinner 2016-09-12 12:55:28 +02:00
parent 410b9887e1
commit b1e169bf4b
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/abstract.h
View File

@ -275,7 +275,9 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
PyAPI_FUNC(PyObject *) _PyStack_AsDict( PyAPI_FUNC(PyObject *) _PyStack_AsDict(
PyObject **values, PyObject **values,
PyObject *kwnames); Py_ssize_t nkwargs,
PyObject *kwnames,
PyObject *func);
/* Convert (args, nargs, kwargs) into a (stack, nargs, kwnames). /* Convert (args, nargs, kwargs) into a (stack, nargs, kwnames).

26
Objects/abstract.c
View File

@ -2367,9 +2367,9 @@ _PyObject_Call_Prepend(PyObject *func,
} }
PyObject * PyObject *
_PyStack_AsDict(PyObject **values, PyObject *kwnames) _PyStack_AsDict(PyObject **values, Py_ssize_t nkwargs, PyObject *kwnames,
PyObject *func)
{ {
Py_ssize_t nkwargs = PyTuple_GET_SIZE(kwnames);
PyObject *kwdict; PyObject *kwdict;
Py_ssize_t i; Py_ssize_t i;
@ -2378,12 +2378,24 @@ _PyStack_AsDict(PyObject **values, PyObject *kwnames)
return NULL; return NULL;
} }
for (i = 0; i < nkwargs; i++) { for (i=0; i < nkwargs; i++) {
int err;
PyObject *key = PyTuple_GET_ITEM(kwnames, i); PyObject *key = PyTuple_GET_ITEM(kwnames, i);
PyObject *value = *values++; PyObject *value = *values++;
assert(PyUnicode_CheckExact(key));
assert(PyDict_GetItem(kwdict, key) == NULL); if (PyDict_GetItem(kwdict, key) != NULL) {
if (PyDict_SetItem(kwdict, key, value)) { PyErr_Format(PyExc_TypeError,
"%.200s%s got multiple values "
"for keyword argument '%U'",
PyEval_GetFuncName(func),
PyEval_GetFuncDesc(func),
key);
Py_DECREF(kwdict);
return NULL;
}
err = PyDict_SetItem(kwdict, key, value);
if (err) {
Py_DECREF(kwdict); Py_DECREF(kwdict);
return NULL; return NULL;
} }
@ -2467,7 +2479,7 @@ _PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs,
} }
if (nkwargs > 0) { if (nkwargs > 0) {
kwdict = _PyStack_AsDict(stack + nargs, kwnames); kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func);
if (kwdict == NULL) { if (kwdict == NULL) {
return NULL; return NULL;
} }

2
Objects/methodobject.c
View File

@ -279,7 +279,7 @@ _PyCFunction_FastCallKeywords(PyObject *func, PyObject **stack,
nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
if (nkwargs > 0) { if (nkwargs > 0) {
kwdict = _PyStack_AsDict(stack + nargs, kwnames); kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func);
if (kwdict == NULL) { if (kwdict == NULL) {
return NULL; return NULL;
} }