From: Nikita Sobolev <mail@sobolevn.me>
Date: Mon, 6 May 2024 07:34:56 +0000 (+0300)
Subject: gh-118613: Fix error handling of `_PyEval_GetFrameLocals` in `ceval.c` (#118614)
X-Git-Tag: v3.13.0b1~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8e5fed1007233f677d3539162257b99b920df00;p=thirdparty%2FPython%2Fcpython.git

gh-118613: Fix error handling of `_PyEval_GetFrameLocals` in `ceval.c` (#118614)
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 0d02a9887bef..128e0417a9fd 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 *