From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 24 Mar 2025 19:27:01 +0000 (+0100)
Subject: [3.13] gh-131670: Fix crash in `anext()` when `__anext__` is sync and raises (GH... 
X-Git-Tag: v3.13.3~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=349209841804e68d055af0046163de09ce68f723;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-131670: Fix crash in `anext()` when `__anext__` is sync and raises (GH-131682) (#131686)

gh-131670: Fix crash in `anext()` when `__anext__` is sync and raises (GH-131682)
(cherry picked from commit 929afd1d6ee4fb89ac818037effe6577947103de)

Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
---

diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
index 951c55028037..3576515522a7 100644
--- a/Lib/test/test_asyncgen.py
+++ b/Lib/test/test_asyncgen.py
@@ -1169,6 +1169,26 @@ class AsyncGenAsyncioTest(unittest.TestCase):
 
         self.loop.run_until_complete(run())
 
+    def test_sync_anext_raises_exception(self):
+        # See: https://github.com/python/cpython/issues/131670
+        msg = 'custom'
+        for exc_type in [
+            StopAsyncIteration,
+            StopIteration,
+            ValueError,
+            Exception,
+        ]:
+            exc = exc_type(msg)
+            with self.subTest(exc=exc):
+                class A:
+                    def __anext__(self):
+                        raise exc
+
+                with self.assertRaisesRegex(exc_type, msg):
+                    anext(A())
+                with self.assertRaisesRegex(exc_type, msg):
+                    anext(A(), 1)
+
     def test_async_gen_asyncio_anext_stopiteration(self):
         async def foo():
             try:
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-03-24-19-38-53.gh-issue-131670.IffOZj.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-03-24-19-38-53.gh-issue-131670.IffOZj.rst
new file mode 100644
index 000000000000..812a75abe1ba
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-03-24-19-38-53.gh-issue-131670.IffOZj.rst
@@ -0,0 +1 @@
+Fix :func:`anext` failing on sync :meth:`~object.__anext__` raising an exception.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 29d4d10f1e41..06bf4d38f9ea 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1737,6 +1737,9 @@ builtin_anext_impl(PyObject *module, PyObject *aiterator,
     }
 
     awaitable = (*t->tp_as_async->am_anext)(aiterator);
+    if (awaitable == NULL) {
+        return NULL;
+    }
     if (default_value == NULL) {
         return awaitable;
     }