Fix refleaks if Py_EnterRecursiveCall() fails

vstinner · vstinner · commit 620580f280e3 · 2017-02-08T12:57:09.000+01:00
Issue python#29306: Destroy argstuple and kwdict if Py_EnterRecursiveCall() fails.
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2350,14 +2350,15 @@ _PyObject_FastCallDict(PyObject *callable, PyObject **args, Py_ssize_t nargs,
         }
 
         if (Py_EnterRecursiveCall(" while calling a Python object")) {
+            Py_DECREF(argstuple);
             return NULL;
         }
 
         result = (*call)(callable, argstuple, kwargs);
 
         Py_LeaveRecursiveCall();
-
         Py_DECREF(argstuple);
+
         result = _Py_CheckFunctionResult(callable, result, NULL);
         return result;
     }
@@ -2544,6 +2545,8 @@ _PyObject_FastCallKeywords(PyObject *callable, PyObject **stack, Py_ssize_t narg
         }
 
         if (Py_EnterRecursiveCall(" while calling a Python object")) {
+            Py_DECREF(argstuple);
+            Py_XDECREF(kwdict);
             return NULL;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2350,14 +2350,15 @@ _PyObject_FastCallDict(PyObject callable, PyObject *args, Py_ssize_t nargs,`
`2350`	`2350`	`}`
`2351`	`2351`
`2352`	`2352`	`if (Py_EnterRecursiveCall(" while calling a Python object")) {`
	`2353`	`+ Py_DECREF(argstuple);`
`2353`	`2354`	`return NULL;`
`2354`	`2355`	`}`
`2355`	`2356`
`2356`	`2357`	`result = (*call)(callable, argstuple, kwargs);`
`2357`	`2358`
`2358`	`2359`	`Py_LeaveRecursiveCall();`
`2359`		`-`
`2360`	`2360`	`Py_DECREF(argstuple);`
	`2361`	`+`
`2361`	`2362`	`result = _Py_CheckFunctionResult(callable, result, NULL);`
`2362`	`2363`	`return result;`
`2363`	`2364`	`}`
`@@ -2544,6 +2545,8 @@ _PyObject_FastCallKeywords(PyObject callable, PyObject *stack, Py_ssize_t narg`
`2544`	`2545`	`}`
`2545`	`2546`
`2546`	`2547`	`if (Py_EnterRecursiveCall(" while calling a Python object")) {`
	`2548`	`+ Py_DECREF(argstuple);`
	`2549`	`+ Py_XDECREF(kwdict);`
`2547`	`2550`	`return NULL;`
`2548`	`2551`	`}`
`2549`	`2552`