From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 18 Jan 2017 17:06:32 +0000 (+0100)
Subject: _PyStack_AsDict() now checks kwnames != NULL
X-Git-Tag: v3.7.0a1~1511
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06d34393c2f1f28bf97873418e2b981e7b188811;p=thirdparty%2FPython%2Fcpython.git

_PyStack_AsDict() now checks kwnames != NULL

Issue #29259.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 7b1f19689117..58640323dcf0 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2399,10 +2399,12 @@ _PyObject_Call_Prepend(PyObject *callable,
 PyObject *
 _PyStack_AsDict(PyObject **values, PyObject *kwnames)
 {
-    Py_ssize_t nkwargs = PyTuple_GET_SIZE(kwnames);
+    Py_ssize_t nkwargs;
     PyObject *kwdict;
     Py_ssize_t i;
 
+    assert(kwnames != NULL);
+    nkwargs = PyTuple_GET_SIZE(kwnames);
     kwdict = _PyDict_NewPresized(nkwargs);
     if (kwdict == NULL) {
         return NULL;