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

It should raise TypeError when kwargs is not a dict.

diff --git a/Misc/NEWS b/Misc/NEWS
index 4f19e75aeaa8fc560fd5b86329fe4fe0e0cfbf51..6af660115fc3e682c7eaf35f6c21cabe6498a890 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.7.0 alpha 1?
 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
   str.__mod__.  Patch by Martijn Pieters.
 

diff --git a/Objects/call.c b/Objects/call.c
index 310b4a205f384719dc5236b477538a50dc297357..a4af816e30994ee26cd3a8944c10f3680cabfc71 100644 (file)
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -766,11 +766,7 @@ PyEval_CallObjectWithKeywords(PyObject *callable,
     assert(!PyErr_Occurred());
 #endif
 
-    if (args == NULL) {
-        return _PyObject_FastCallDict(callable, 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;
@@ -782,7 +778,12 @@ PyEval_CallObjectWithKeywords(PyObject *callable,
         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);
+    }
 }