PyEval_CallObjectWithKeywords() doesn't inc/decref

vstinner · vstinner · commit 6e2333dfdf54 · 2016-08-23T00:25:01.000+02:00
Issue #27809: PyEval_CallObjectWithKeywords() doesn't increment temporary the reference counter of the args tuple (positional arguments). The caller already holds a strong reference to it.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4580,8 +4580,6 @@ PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
 PyObject *
 PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
 {
-    PyObject *result;
-
 #ifdef Py_DEBUG
     /* PyEval_CallObjectWithKeywords() must not be called with an exception
        set. It raises a new exception if parameters are invalid or if
@@ -4605,11 +4603,7 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
         return NULL;
     }
 
-    Py_INCREF(args);
-    result = PyObject_Call(func, args, kwargs);
-    Py_DECREF(args);
-
-    return result;
+    return PyObject_Call(func, args, kwargs);
 }
 
 const char *

Original file line number	Diff line number	Diff line change
`@@ -4580,8 +4580,6 @@ PyEval_MergeCompilerFlags(PyCompilerFlags *cf)`
`4580`	`4580`	`PyObject *`
`4581`	`4581`	`PyEval_CallObjectWithKeywords(PyObject func, PyObject args, PyObject *kwargs)`
`4582`	`4582`	`{`
`4583`		`- PyObject *result;`
`4584`		`-`
`4585`	`4583`	`#ifdef Py_DEBUG`
`4586`	`4584`	`/* PyEval_CallObjectWithKeywords() must not be called with an exception`
`4587`	`4585`	`set. It raises a new exception if parameters are invalid or if`
`@@ -4605,11 +4603,7 @@ PyEval_CallObjectWithKeywords(PyObject func, PyObject args, PyObject *kwargs)`
`4605`	`4603`	`return NULL;`
`4606`	`4604`	`}`
`4607`	`4605`
`4608`		`- Py_INCREF(args);`
`4609`		`- result = PyObject_Call(func, args, kwargs);`
`4610`		`- Py_DECREF(args);`
`4611`		`-`
`4612`		`- return result;`
	`4606`	`+ return PyObject_Call(func, args, kwargs);`
`4613`	`4607`	`}`
`4614`	`4608`
`4615`	`4609`	`const char *`