pythongh-118613: Fix error handling of _PyEval_GetFrameLocals in `c…

…eval.c` (python#118614)
SonicField · May 8, 2024 · 86213f9 · 86213f9
1 parent 3268920
commit 86213f9
Showing 1 changed file with 8 additions and 4 deletions.
diff --git 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 *