[3.13] gh-128198: Add missing error checks for usages of PyIter_Next() (GH-128199...

(cherry picked from commit 5c814c83cdd3dc42bd9682106ffb7ade7ce6b5b3)

Co-authored-by: Yan Yanchii <yyanchiy@gmail.com>

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 44afda0c755ab0a627b58b6b46af4053af854f47..8c596ede70ca3d861b9dc613c5b6718b253cb4a1 100644 (file)
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -263,6 +263,10 @@ framelocalsproxy_merge(PyObject* self, PyObject* other)
 
     Py_DECREF(iter);
 
+    if (PyErr_Occurred()) {
+        return -1;
+    }
+
     return 0;
 }
 

diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
index 5b7547103a2b3fc5f239effe70a45934a3b6e056..4ef3bd92f5a56968cf490817f1a60e54c2756637 100644 (file)
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -141,6 +141,10 @@ namespace_repr(PyObject *ns)
             goto error;
     }
 
+    if (PyErr_Occurred()) {
+        goto error;
+    }
+
     separator = PyUnicode_FromString(", ");
     if (separator == NULL)
         goto error;