changeset:   106228:bf6728085b01
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed Jan 18 18:06:32 2017 +0100
files:       Objects/abstract.c
description:
_PyStack_AsDict() now checks kwnames != NULL

Issue #29259.


diff -r 07523532039d -r bf6728085b01 Objects/abstract.c
--- a/Objects/abstract.c	Wed Jan 18 13:10:36 2017 -0800
+++ b/Objects/abstract.c	Wed Jan 18 18:06:32 2017 +0100
@@ -2399,10 +2399,12 @@
 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;