https://github.com/python/cpython/commit/aded5b98497e9ebf025298377abfd39b6bd82cdb
commit: aded5b98497e9ebf025298377abfd39b6bd82cdb
branch: 3.15
author: Miss Islington (bot) <[email protected]>
committer: ZeroIntensity <[email protected]>
date: 2026-11-17T03:38:56Z
summary:

[3.15] gh-161996: Fix crash in `Interpreter.exec` when the uncaught exception's 
`__str__` raises (GH-162000) (GH-162145)

(cherry picked from commit b90572af8f94568d9373edb7b1f22ee09d49b8a4)

Co-authored-by: An Long <[email protected]>

files:
A Misc/NEWS.d/next/Library/2026-11-14-21-04-56.gh-issue-161996.35uL2d.rst
M Lib/test/test_interpreters/test_api.py
M Python/crossinterp.c

diff --git a/Lib/test/test_interpreters/test_api.py 
b/Lib/test/test_interpreters/test_api.py
index aac3cdd717668ca..128e6c70d73408b 100644
--- a/Lib/test/test_interpreters/test_api.py
+++ b/Lib/test/test_interpreters/test_api.py
@@ -922,6 +922,21 @@ def test_failure(self):
         with self.assertRaises(ExecutionFailed):
             interp.exec('raise Exception')
 
+    def test_failure_with_broken_exception_str(self):
+        interp = interpreters.create()
+        for raised, expected in [
+            ('ValueError', interpreters.InterpreterError),
+            ('MemoryError', MemoryError),
+        ]:
+            with self.subTest(raised=raised):
+                with self.assertRaises(expected):
+                    interp.exec(dedent(f"""
+                        class BrokenError(Exception):
+                            def __str__(self):
+                                raise {raised}
+                        raise BrokenError
+                        """))
+
     @force_not_colorized
     def test_display_preserved_exception(self):
         tempdir = self.temp_dir()
diff --git 
a/Misc/NEWS.d/next/Library/2026-11-14-21-04-56.gh-issue-161996.35uL2d.rst 
b/Misc/NEWS.d/next/Library/2026-11-14-21-04-56.gh-issue-161996.35uL2d.rst
new file mode 100644
index 000000000000000..561bb62d6537073
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2026-11-14-21-04-56.gh-issue-161996.35uL2d.rst
@@ -0,0 +1,2 @@
+Fix a crash in :meth:`concurrent.interpreters.Interpreter.exec` when the
+uncaught exception's ``__str__`` raises.
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index d189d7bcefe313e..a91b45ba2cbcf45 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -2018,6 +2018,14 @@ _PyXI_ApplyError(_PyXI_error *error, const char *failure)
     PyThreadState *tstate = PyThreadState_Get();
 
     if (failure != NULL) {
+        if (error->override != NULL
+            && error->override->code == _PyXI_ERR_NO_MEMORY)
+        {
+            PyErr_NoMemory();
+        }
+        else {
+            PyErr_SetString(PyExc_InterpreterError, failure);
+        }
         xi_error_clear(error);
         return NULL;
     }

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

Reply via email to