python · kumaraditya303 · Nov 5, 2024 · Nov 3, 2024 · Nov 3, 2024 · Nov 3, 2024
diff --git a/Lib/test/test_yield_from.py b/Lib/test/test_yield_from.py
@@ -1576,6 +1576,19 @@ def outer():
            self.assertIsNone(caught.exception.__context__)
            self.assert_stop_iteration(g)

+    def test_throws_in_iter(self):
+        # See GH-126366: NULL pointer dereference if __iter__
+        # threw an exception.
+        class Silly:
+            def __iter__(self):
+                raise RuntimeError("nobody expects the spanish inquisition")
+
+        def my_generator():
+            yield from Silly()
+
+        with self.assertRaisesRegex(RuntimeError, "nobody expects the spanish inquisition"):
+            next(iter(my_generator()))
+

 if __name__ == '__main__':
    unittest.main()
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-11-03-15-15-36.gh-issue-126366.8BBdGU.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-11-03-15-15-36.gh-issue-126366.8BBdGU.rst
@@ -0,0 +1,2 @@
+Fix crash when using ``yield from`` on an object that raises an exception in
+its ``__iter__``.
@@ -2791,11 +2791,12 @@ dummy_func(
            }
            else {
                /* `iterable` is not a generator. */
-                iter = PyStackRef_FromPyObjectSteal(PyObject_GetIter(iterable_o));
+                PyObject *iter_o = PyObject_GetIter(iterable_o);
                DEAD(iterable);
-                if (PyStackRef_IsNull(iter)) {
+                if (iter_o == NULL) {
                    ERROR_NO_POP();
                }
+                iter = PyStackRef_FromPyObjectSteal(iter_o);
                DECREF_INPUTS();
            }
        }

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
@@ -82,3 +82,4 @@ test.test_subprocess.ProcessTestCaseNoPoll.test_empty_env
 test.test_subprocess.ProcessTestCaseNoPoll.test_file_not_found_includes_filename
 test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable
 test.test_venv.BasicTest.test_zippath_from_non_installed_posix
+test.test_subprocess.POSIXProcessTestCase.test_vfork_used_when_expected
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fix crash when using ``yield from`` on an object that raises an exception in
		its ``__iter__``.
-Original file line number
+Diff line change
@@ -82,3 +82,4 @@ test.test_subprocess.ProcessTestCaseNoPoll.test_empty_env
     test.test_subprocess.ProcessTestCaseNoPoll.test_file_not_found_includes_filename
     test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable
     test.test_venv.BasicTest.test_zippath_from_non_installed_posix
+    test.test_subprocess.POSIXProcessTestCase.test_vfork_used_when_expected
                   ZeroIntensity marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.