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

bpo-29684: Fix regression of PyEval_CallObjectWithKeywords (GH-87) 

It should raise TypeError when kwargs is not a dict.
This commit is contained in:
INADA Naoki 2017-03-01 20:41:03 +09:00 committed by GitHub
parent f5184745a5
commit 3824cd8fd4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -10,6 +10,10 @@ What's New in Python 3.7.0 alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- bpo-29684: Fix minor regression of PyEval_CallObjectWithKeywords.
It should raise TypeError when kwargs is not a dict. But it might
cause segv when args=NULL and kwargs is not a dict.
- bpo-28598: Support __rmod__ for subclasses of str being called before - bpo-28598: Support __rmod__ for subclasses of str being called before
str.__mod__. Patch by Martijn Pieters. str.__mod__. Patch by Martijn Pieters.

13
Objects/call.c
View File

@ -766,11 +766,7 @@ PyEval_CallObjectWithKeywords(PyObject *callable,
assert(!PyErr_Occurred()); assert(!PyErr_Occurred());
#endif #endif
if (args == NULL) { if (args != NULL && !PyTuple_Check(args)) {
return _PyObject_FastCallDict(callable, NULL, 0, kwargs);
}
if (!PyTuple_Check(args)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"argument list must be a tuple"); "argument list must be a tuple");
return NULL; return NULL;
@ -782,7 +778,12 @@ PyEval_CallObjectWithKeywords(PyObject *callable,
return NULL; return NULL;
} }
return PyObject_Call(callable, args, kwargs); if (args == NULL) {
return _PyObject_FastCallDict(callable, NULL, 0, kwargs);
}
else {
return PyObject_Call(callable, args, kwargs);
}
} }