From: AN Long Date: Mon, 17 Jun 2024 15:57:22 +0000 (+0800) Subject: gh-115649: Copy the filename into main interpreter before intern in import.c (#120315) X-Git-Tag: v3.14.0a1~1457 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28140d1f2da1766bfbb83f58779f15255c73c871;p=thirdparty%2FPython%2Fcpython.git gh-115649: Copy the filename into main interpreter before intern in import.c (#120315) Co-authored-by: Kumar Aditya --- diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py index 97e262cfdb90..e29097baaf53 100644 --- a/Lib/test/test_import/__init__.py +++ b/Lib/test/test_import/__init__.py @@ -2138,6 +2138,8 @@ class SubinterpImportTests(unittest.TestCase): self.check_incompatible_here(module) with self.subTest(f'{module}: strict, fresh'): self.check_incompatible_fresh(module) + with self.subTest(f'{module}: isolated, fresh'): + self.check_incompatible_fresh(module, isolated=True) @unittest.skipIf(_testmultiphase is None, "test requires _testmultiphase module") def test_multi_init_extension_compat(self): diff --git a/Python/import.c b/Python/import.c index 2c7a461ac786..932881950d7b 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1969,7 +1969,17 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0, if (info->filename != NULL) { // XXX There's a refleak somewhere with the filename. // Until we can track it down, we intern it. - PyObject *filename = Py_NewRef(info->filename); + PyObject *filename = NULL; + if (switched) { + // The original filename may be allocated by subinterpreter's + // obmalloc, so we create a copy here. + filename = _PyUnicode_Copy(info->filename); + if (filename == NULL) { + return NULL; + } + } else { + filename = Py_NewRef(info->filename); + } PyUnicode_InternInPlace(&filename); if (PyModule_AddObjectRef(mod, "__file__", filename) < 0) { PyErr_Clear(); /* Not important enough to report */