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

GH-128199) (GH-128272) (cherry picked from commit 5c814c8) Co-authored-by: Yan Yanchii <[email protected]>
python · Dec 26, 2024 · c30cad0 · c30cad0
1 parent 32adae1
commit c30cad0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -141,6 +141,10 @@ namespace_repr(PyObject *ns)
             goto error;
     }
 
+    if (PyErr_Occurred()) {
+        goto error;
+    }
+
     separator = PyUnicode_FromString(", ");
     if (separator == NULL)
         goto error;