_PyStack_AsDict() now checks kwnames != NULL

Issue #29259.

_PyStack_AsDict() now checks kwnames != NULL
Issue #29259.
06d34393 · Victor Stinner · c75340a8 · 06d34393
Commit 06d34393 authored Jan 18, 2017 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Objects/abstract.c Objects/abstract.c +3 -1

No files found.
--- 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;