Add PyIter_Next error check in frameobject.c`

python · Dec 23, 2024 · 992aff1 · 992aff1
1 parent 9f65b09
commit 992aff1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
@@ -264,6 +264,11 @@ framelocalsproxy_merge(PyObject* self, PyObject* other)
 
     Py_DECREF(iter);
 
+    /* Check if loop ended because of exception in PyIter_Next */
+    if (PyErr_Occurred()) {
+        return -1;
+    }
+
     return 0;
 }