From a8e5fed1007233f677d3539162257b99b920df00 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Mon, 6 May 2024 10:34:56 +0300 Subject: [PATCH] gh-118613: Fix error handling of `_PyEval_GetFrameLocals` in `ceval.c` (#118614) --- Python/ceval.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c index 0d02a9887bef7a..128e0417a9fd63 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2496,17 +2496,21 @@ _PyEval_GetFrameLocals(void) if (PyFrameLocalsProxy_Check(locals)) { PyObject* ret = PyDict_New(); - if (PyDict_Update(ret, locals)) { + if (ret == NULL) { + Py_DECREF(locals); + return NULL; + } + if (PyDict_Update(ret, locals) < 0) { Py_DECREF(ret); + Py_DECREF(locals); return NULL; } Py_DECREF(locals); return ret; - } else if (PyMapping_Check(locals)) { - return locals; } - return NULL; + assert(PyMapping_Check(locals)); + return locals; } PyObject *