]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
_PyStack_AsDict() now checks kwnames != NULL
authorVictor Stinner <victor.stinner@gmail.com>
Wed, 18 Jan 2017 17:06:32 +0000 (18:06 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Wed, 18 Jan 2017 17:06:32 +0000 (18:06 +0100)
Issue #29259.

Objects/abstract.c

index 7b1f19689117b04839980e0fec68abd07ce5b82f..58640323dcf0a2b3a84e25b77849f58463bf6b64 100644 (file)
@@ -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;