Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-115649: Copy the filename into main interpreter before intern in import.c (#120315) 

Co-authored-by: Kumar Aditya <kumaraditya@python.org>
This commit is contained in:
AN Long 2024-06-17 23:57:22 +08:00 committed by GitHub
parent 95737bbf18
commit 28140d1f2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_import/__init__.py
View File

@ -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):

12
Python/import.c
View File

@ -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 */