https://github.com/python/cpython/commit/b90572af8f94568d9373edb7b1f22ee09d49b8a4
commit: b90572af8f94568d9373edb7b1f22ee09d49b8a4
branch: main
author: An Long <[email protected]>
committer: ZeroIntensity <[email protected]>
date: 2026-11-16T22:00:31-05:00
summary:
gh-161996: Fix crash in `Interpreter.exec` when the uncaught exception's
`__str__` raises (GH-162000)
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 a9e296891bb8705..e9a64915a1b4a87 100644
--- a/Lib/test/test_interpreters/test_api.py
+++ b/Lib/test/test_interpreters/test_api.py
@@ -947,6 +947,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]