Fix reference leaks (needs cleanup)

pablogsal · pablogsal · commit 1de88f6f9e96 · 2021-10-07T10:57:54.000+01:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -5648,7 +5648,12 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFrameConstructor *con,
     PyObject **localsarray = _PyFrame_GetLocalsArray(frame);
     if (initialize_locals(tstate, con, localsarray, args, argcount, kwnames, steal_args)) {
         if (steal_args) {
-            for (int i = 0; i < frame->stacktop; i++) {
+            // If we failed to initialize locals, make sure the caller still own all the
+            // arguments. Notice that we only need to increase the reference count of the
+            // *valid* arguments (i.e. the ones that fit into the frame). 
+            PyCodeObject *co = (PyCodeObject*)con->fc_code;
+            const Py_ssize_t total_args = co->co_argcount + co->co_kwonlyargcount;
+            for (Py_ssize_t i = 0; i < Py_MIN(argcount, total_args); i++) {
                 Py_XINCREF(frame->localsplus[i]);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -5648,7 +5648,12 @@ _PyEvalFramePushAndInit(PyThreadState tstate, PyFrameConstructor con,`
`5648`	`5648`	`PyObject **localsarray = _PyFrame_GetLocalsArray(frame);`
`5649`	`5649`	`if (initialize_locals(tstate, con, localsarray, args, argcount, kwnames, steal_args)) {`
`5650`	`5650`	`if (steal_args) {`
`5651`		`- for (int i = 0; i < frame->stacktop; i++) {`
	`5651`	`+ // If we failed to initialize locals, make sure the caller still own all the`
	`5652`	`+ // arguments. Notice that we only need to increase the reference count of the`
	`5653`	`+ // valid arguments (i.e. the ones that fit into the frame).`
	`5654`	`+ PyCodeObject co = (PyCodeObject)con->fc_code;`
	`5655`	`+ const Py_ssize_t total_args = co->co_argcount + co->co_kwonlyargcount;`
	`5656`	`+ for (Py_ssize_t i = 0; i < Py_MIN(argcount, total_args); i++) {`
`5652`	`5657`	`Py_XINCREF(frame->localsplus[i]);`
`5653`	`5658`	`}`
`5654`	`5659`	`}`