ssue #27213: Reintroduce checks in _PyStack_AsDict()

vstinner · vstinner · commit b1e169bf4b8c · 2016-09-12T12:55:28.000+02:00
diff --git a/Include/abstract.h b/Include/abstract.h
@@ -275,7 +275,9 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
 
     PyAPI_FUNC(PyObject *) _PyStack_AsDict(
         PyObject **values,
-        PyObject *kwnames);
+        Py_ssize_t nkwargs,
+        PyObject *kwnames,
+        PyObject *func);
 
     /* Convert (args, nargs, kwargs) into a (stack, nargs, kwnames).
 
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2367,9 +2367,9 @@ _PyObject_Call_Prepend(PyObject *func,
 }
 
 PyObject *
-_PyStack_AsDict(PyObject **values, PyObject *kwnames)
+_PyStack_AsDict(PyObject **values, Py_ssize_t nkwargs, PyObject *kwnames,
+                PyObject *func)
 {
-    Py_ssize_t nkwargs = PyTuple_GET_SIZE(kwnames);
     PyObject *kwdict;
     Py_ssize_t i;
 
@@ -2378,12 +2378,24 @@ _PyStack_AsDict(PyObject **values, PyObject *kwnames)
         return NULL;
     }
 
-    for (i = 0; i < nkwargs; i++) {
+    for (i=0; i < nkwargs; i++) {
+        int err;
         PyObject *key = PyTuple_GET_ITEM(kwnames, i);
         PyObject *value = *values++;
-        assert(PyUnicode_CheckExact(key));
-        assert(PyDict_GetItem(kwdict, key) == NULL);
-        if (PyDict_SetItem(kwdict, key, value)) {
+
+        if (PyDict_GetItem(kwdict, key) != NULL) {
+            PyErr_Format(PyExc_TypeError,
+                         "%.200s%s got multiple values "
+                         "for keyword argument '%U'",
+                         PyEval_GetFuncName(func),
+                         PyEval_GetFuncDesc(func),
+                         key);
+            Py_DECREF(kwdict);
+            return NULL;
+        }
+
+        err = PyDict_SetItem(kwdict, key, value);
+        if (err) {
             Py_DECREF(kwdict);
             return NULL;
         }
@@ -2467,7 +2479,7 @@ _PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs,
     }
 
     if (nkwargs > 0) {
-        kwdict = _PyStack_AsDict(stack + nargs, kwnames);
+        kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func);
         if (kwdict == NULL) {
             return NULL;
         }
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
@@ -279,7 +279,7 @@ _PyCFunction_FastCallKeywords(PyObject *func, PyObject **stack,
 
     nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
     if (nkwargs > 0) {
-        kwdict = _PyStack_AsDict(stack + nargs, kwnames);
+        kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func);
         if (kwdict == NULL) {
             return NULL;
         }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ _PyCFunction_FastCallKeywords(PyObject func, PyObject *stack,`
`279`	`279`
`280`	`280`	`nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);`
`281`	`281`	`if (nkwargs > 0) {`
`282`		`- kwdict = _PyStack_AsDict(stack + nargs, kwnames);`
	`282`	`+ kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func);`
`283`	`283`	`if (kwdict == NULL) {`
`284`	`284`	`return NULL;`
`285`	`285`	`}`