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

miss-islington · 1st1 · web-flow · commit b1a94f1fab7c · 2022-01-11T15:09:22.000-08:00
First introduced in 0332e56 (cherry picked from commit 607d8a8) Co-authored-by: Yury Selivanov <yury@edgedb.com>
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
@@ -5132,16 +5132,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
`@@ -5132,16 +5132,9 @@ PyEval_EvalCodeEx(PyObject _co, PyObject globals, PyObject *locals,`
`5132`	`5132`	`}`
`5133`	`5133`	`allargs = newargs;`
`5134`	`5134`	`}`
`5135`		`- PyObject *kwargs = PyMem_Malloc(sizeof(PyObject )*kwcount);`
`5136`		`- if (kwargs == NULL) {`
`5137`		`- res = NULL;`
`5138`		`- Py_DECREF(kwnames);`
`5139`		`- goto fail;`
`5140`		`- }`
`5141`	`5135`	`for (int i = 0; i < kwcount; i++) {`
`5142`	`5136`	`Py_INCREF(kws[2*i]);`
`5143`	`5137`	`PyTuple_SET_ITEM(kwnames, i, kws[2*i]);`
`5144`		`- kwargs[i] = kws[2*i+1];`
`5145`	`5138`	`}`
`5146`	`5139`	`PyFrameConstructor constr = {`
`5147`	`5140`	`.fc_globals = globals,`