From: INADA Naoki <methane@users.noreply.github.com>
Date: Wed, 1 Mar 2017 12:14:43 +0000 (+0900)
Subject: bpo-29684: Fix minor regression of PyEval_CallObjectWithKeywords. (GH-378)
X-Git-Tag: v3.6.1rc1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=023532e558bb0c5bf60195aebbafe63a0bebd85e;p=python

bpo-29684: Fix minor regression of PyEval_CallObjectWithKeywords. (GH-378)
---

diff --git a/Misc/NEWS b/Misc/NEWS
index fe420b62f2..33559a7abb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.6.1 release candidate 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.
+
 - 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 83667353af..02bc67ef71 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4699,11 +4699,7 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
     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 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
         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 *