[3.11] gh-113842: Add missing error check for PyIter_Next() in Python/symtable.c (GH-113843) (GH-113852)

miss-islington · WolframAlph · web-flow · commit 50efd7db20a3 · 2024-01-09T11:09:32.000Z
(cherry picked from commit fda901a) Co-authored-by: Yan Yanchii <yyanchiy@gmail.com>
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -728,6 +728,12 @@ update_symbols(PyObject *symbols, PyObject *scopes,
         }
         Py_DECREF(name);
     }
+
+    /* Check if loop ended because of exception in PyIter_Next */
+    if (PyErr_Occurred()) {
+        goto error;
+    }
+
     Py_DECREF(itr);
     Py_DECREF(v_free);
     return 1;

Original file line number	Diff line number	Diff line change
`@@ -728,6 +728,12 @@ update_symbols(PyObject symbols, PyObject scopes,`
`728`	`728`	`}`
`729`	`729`	`Py_DECREF(name);`
`730`	`730`	`}`
	`731`	`+`
	`732`	`+ /* Check if loop ended because of exception in PyIter_Next */`
	`733`	`+ if (PyErr_Occurred()) {`
	`734`	`+ goto error;`
	`735`	`+ }`
	`736`	`+`
`731`	`737`	`Py_DECREF(itr);`
`732`	`738`	`Py_DECREF(v_free);`
`733`	`739`	`return 1;`