python · JelleZijlstra · Oct 22, 2024 · Oct 9, 2024 · Oct 9, 2024 · Oct 9, 2024
diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py
@@ -515,6 +515,61 @@ def make_frame():
         with self.assertRaises(TypeError):
             FrameLocalsProxy(frame=sys._getframe())  # no keyword arguments
 
+    def test_generator_f_locals(self):
+        def get_generator_genexpr(new_value):
+            g = (x for x in range(10))
+            g.gi_frame.f_locals['.0'] = new_value
+            return g
+
+        def get_generator_fn_call(new_value):
+            def gen(it):
+                for x in it:
+                    yield x
+
+            g = gen(range(10))
+            g.gi_frame.f_locals['it'] = new_value
+            return g
+
+        err_msg_pattern_genexpr = "'for' requires an object with __iter__ method, got %s"
+        err_msg_pattern_fn_call = "'%s' object is not iterable"
+
+        sequences = [
+            range(0),
+            range(20),
+            [1, 2, 3],
+            (2,),
+            set((13, 48, 211)),
+            frozenset((15, 8, 6)),
+            dict([(1, 2), (3, 4)]),
+        ]
+
+        for seq in sequences:
+            err_msg_genexpr = err_msg_pattern_genexpr % type(seq).__name__
+            with self.assertRaisesRegex(TypeError, err_msg_genexpr):
+                list(get_generator_genexpr(seq))
+            self.assertListEqual(list(get_generator_genexpr(iter(seq))),
+                                 list(seq))
+
+            self.assertListEqual(list(get_generator_fn_call(seq)),
+                                 list(seq))
+            self.assertListEqual(list(get_generator_fn_call(iter(seq))),
+                                 list(seq))
+
+        non_sequences = [
+            None,
+            42,
+            3.0,
+            2j,
+        ]
+
+        for obj in non_sequences:
+            err_msg_genexpr = err_msg_pattern_genexpr % type(obj).__name__
+            with self.assertRaisesRegex(TypeError, err_msg_genexpr):
+                list(get_generator_genexpr(obj))
+            err_msg_fn_call = err_msg_pattern_fn_call % type(obj).__name__
+            with self.assertRaisesRegex(TypeError, err_msg_fn_call):
+                list(get_generator_fn_call(obj))
+
 
 class FrameLocalsProxyMappingTests(mapping_tests.TestHashMappingProtocol):
     """Test that FrameLocalsProxy behaves like a Mapping (with exceptions)"""

diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-10-09-13-53-50.gh-issue-125038.ffSLCz.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-10-09-13-53-50.gh-issue-125038.ffSLCz.rst
@@ -0,0 +1,3 @@
+Fix crash when iterating over a generator expression after direct changes on ``gi_frame.f_locals``.
+Tests on generator modifying through ``gi_frame.f_locals`` are added,
+both to genexpr generators and function generators. Patch by Mikhail Efimov.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2806,7 +2806,16 @@ dummy_func(
         replaced op(_FOR_ITER, (iter -- iter, next)) {
             /* before: [iter]; after: [iter, iter()] *or* [] (and jump over END_FOR.) */
             PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
-            PyObject *next_o = (*Py_TYPE(iter_o)->tp_iternext)(iter_o);
+            PyTypeObject *type = Py_TYPE(iter_o);
+            iternextfunc iternext = type->tp_iternext;
+            if (iternext == NULL) {
+                _PyErr_Format(tstate, PyExc_TypeError,
+                              "'for' requires an object with "
+                              "__iter__ method, got %.100s",
+                              type->tp_name);
+                ERROR_NO_POP();
+            }
+            PyObject *next_o = (*iternext)(iter_o);
             if (next_o == NULL) {
                 if (_PyErr_Occurred(tstate)) {
                     int matches = _PyErr_ExceptionMatches(tstate, PyExc_StopIteration);
@@ -2832,7 +2841,16 @@ dummy_func(
         op(_FOR_ITER_TIER_TWO, (iter -- iter, next)) {
             /* before: [iter]; after: [iter, iter()] *or* [] (and jump over END_FOR.) */
             PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
-            PyObject *next_o = (*Py_TYPE(iter_o)->tp_iternext)(iter_o);
+            PyTypeObject *type = Py_TYPE(iter_o);
+            iternextfunc iternext = type->tp_iternext;
+            if (iternext == NULL) {
+                _PyErr_Format(tstate, PyExc_TypeError,
+                              "'for' requires an object with "
+                              "__iter__ method, got %.100s",
+                              type->tp_name);
+                ERROR_NO_POP();
+            }
+            PyObject *next_o = (*iternext)(iter_o);
             if (next_o == NULL) {
                 if (_PyErr_Occurred(tstate)) {
                     int matches = _PyErr_ExceptionMatches(tstate, PyExc_StopIteration);
@@ -2856,7 +2874,16 @@ dummy_func(
             _Py_CODEUNIT *target;
             _PyStackRef iter_stackref = TOP();
             PyObject *iter = PyStackRef_AsPyObjectBorrow(iter_stackref);
-            PyObject *next = (*Py_TYPE(iter)->tp_iternext)(iter);
+            PyTypeObject *type = Py_TYPE(iter);
+            iternextfunc iternext = type->tp_iternext;
+            if (iternext == NULL) {
+                _PyErr_Format(tstate, PyExc_TypeError,
+                              "'for' requires an object with "
+                              "__iter__ method, got %.100s",
+                              type->tp_name);
+                ERROR_NO_POP();
+            }
+            PyObject *next = (*iternext)(iter);
             if (next != NULL) {
                 PUSH(PyStackRef_FromPyObjectSteal(next));
                 target = next_instr;

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h