bpo-29684: Fix minor regression of PyEval_CallObjectWithKeywords. (GH-378)
diff --git a/Misc/NEWS b/Misc/NEWS
index fe420b6..33559a7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
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.
+
- Issue #28598: Support __rmod__ for subclasses of str being called before
str.__mod__. Patch by Martijn Pieters.
diff --git a/Python/ceval.c b/Python/ceval.c
index 8366735..02bc67e 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4699,11 +4699,7 @@
assert(!PyErr_Occurred());
#endif
- if (args == NULL) {
- return _PyObject_FastCallDict(func, NULL, 0, kwargs);
- }
-
- if (!PyTuple_Check(args)) {
+ if (args != NULL && !PyTuple_Check(args)) {
PyErr_SetString(PyExc_TypeError,
"argument list must be a tuple");
return NULL;
@@ -4715,7 +4711,12 @@
return NULL;
}
- return PyObject_Call(func, args, kwargs);
+ if (args == NULL) {
+ return _PyObject_FastCallDict(func, NULL, 0, kwargs);
+ }
+ else {
+ return PyObject_Call(func, args, kwargs);
+ }
}
const char *