bpo-46347: Fix memory leak in PyEval_EvalCodeEx. (#30546)

1st1 · web-flow · commit 607d8a838f29 · 2022-01-11T14:25:28.000-08:00
First introduced in 0332e56
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-01-11-13-57-00.bpo-46347.Gd8M-S.rst b/Misc/NEWS.d/next/Core and Builtins/2022-01-11-13-57-00.bpo-46347.Gd8M-S.rst
@@ -0,0 +1 @@
+Fix memory leak in PyEval_EvalCodeEx.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -6128,16 +6128,9 @@ PyEval_EvalCodeEx(PyObject *_co, PyObject *globals, PyObject *locals,
         }
         allargs = newargs;
     }
-    PyObject **kwargs = PyMem_Malloc(sizeof(PyObject *)*kwcount);
-    if (kwargs == NULL) {
-        res = NULL;
-        Py_DECREF(kwnames);
-        goto fail;
-    }
     for (int i = 0; i < kwcount; i++) {
         Py_INCREF(kws[2*i]);
         PyTuple_SET_ITEM(kwnames, i, kws[2*i]);
-        kwargs[i] = kws[2*i+1];
     }
     PyFrameConstructor constr = {
         .fc_globals = globals,

Original file line number	Diff line number	Diff line change
`@@ -6128,16 +6128,9 @@ PyEval_EvalCodeEx(PyObject _co, PyObject globals, PyObject *locals,`
`6128`	`6128`	`}`
`6129`	`6129`	`allargs = newargs;`
`6130`	`6130`	`}`
`6131`		`- PyObject *kwargs = PyMem_Malloc(sizeof(PyObject )*kwcount);`
`6132`		`- if (kwargs == NULL) {`
`6133`		`- res = NULL;`
`6134`		`- Py_DECREF(kwnames);`
`6135`		`- goto fail;`
`6136`		`- }`
`6137`	`6131`	`for (int i = 0; i < kwcount; i++) {`
`6138`	`6132`	`Py_INCREF(kws[2*i]);`
`6139`	`6133`	`PyTuple_SET_ITEM(kwnames, i, kws[2*i]);`
`6140`		`- kwargs[i] = kws[2*i+1];`
`6141`	`6134`	`}`
`6142`	`6135`	`PyFrameConstructor constr = {`
`6143`	`6136`	`.fc_globals = globals,`