From b01bb960b711402be595639ad9cca4f56a22b89a Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sun, 6 Apr 2025 23:09:53 +0300 Subject: [PATCH] gh-132171: Fix `_interpreters.run_string` crash on string subclass --- Lib/test/test__interpreters.py | 6 ++++++ .../Library/2025-04-06-23-09-21.gh-issue-132171.zZqvfn.rst | 1 + Modules/_interpretersmodule.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2025-04-06-23-09-21.gh-issue-132171.zZqvfn.rst diff --git a/Lib/test/test__interpreters.py b/Lib/test/test__interpreters.py index 7fba16bafbac379..ec376773e40f62a 100644 --- a/Lib/test/test__interpreters.py +++ b/Lib/test/test__interpreters.py @@ -746,6 +746,12 @@ def test_bytes_for_script(self): with self.assertRaises(TypeError): _interpreters.run_string(self.id, b'print("spam")') + def test_str_subclass_string(self): + class StrSubclass(str): pass + + output = _run_output(self.id, StrSubclass('print(1 + 2)')) + self.assertEqual(output, '3\n') + def test_with_shared(self): r, w = os.pipe() diff --git a/Misc/NEWS.d/next/Library/2025-04-06-23-09-21.gh-issue-132171.zZqvfn.rst b/Misc/NEWS.d/next/Library/2025-04-06-23-09-21.gh-issue-132171.zZqvfn.rst new file mode 100644 index 000000000000000..89f34fa3168cae2 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-04-06-23-09-21.gh-issue-132171.zZqvfn.rst @@ -0,0 +1 @@ +Fix crash of ``_interpreters.run_string`` on string subclasses. diff --git a/Modules/_interpretersmodule.c b/Modules/_interpretersmodule.c index 707e654005bc596..38bd038b6b92055 100644 --- a/Modules/_interpretersmodule.c +++ b/Modules/_interpretersmodule.c @@ -330,7 +330,7 @@ get_code_str(PyObject *arg, Py_ssize_t *len_p, PyObject **bytes_p, int *flags_p) int flags = 0; if (PyUnicode_Check(arg)) { - assert(PyUnicode_CheckExact(arg) + assert(PyUnicode_Check(arg) && (check_code_str((PyUnicodeObject *)arg) == NULL)); codestr = PyUnicode_AsUTF8AndSize(arg, &len); if (codestr == NULL) {