Add missing PyIter_Next error check in frameobject.c

WolframAlph · WolframAlph · commit 4c9debae2c7b · 2024-12-23T17:33:34.000+01:00
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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,11 @@ framelocalsproxy_merge(PyObject* self, PyObject* other)`
`264`	`264`
`265`	`265`	`Py_DECREF(iter);`
`266`	`266`
	`267`	`+ /* Check if loop ended because of exception in PyIter_Next */`
	`268`	`+ if (PyErr_Occurred()) {`
	`269`	`+ return -1;`
	`270`	`+ }`
	`271`	`+`
`267`	`272`	`return 0;`
`268`	`273`	`}`
`269`	`274`