mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source 
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
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) self.check_incompatible_here(module)
with self.subTest(f'{module}: strict, fresh'): with self.subTest(f'{module}: strict, fresh'):
self.check_incompatible_fresh(module) 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") @unittest.skipIf(_testmultiphase is None, "test requires _testmultiphase module")
def test_multi_init_extension_compat(self): 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) { if (info->filename != NULL) {
// XXX There's a refleak somewhere with the filename. // XXX There's a refleak somewhere with the filename.
// Until we can track it down, we intern it. // 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); PyUnicode_InternInPlace(&filename);
if (PyModule_AddObjectRef(mod, "__file__", filename) < 0) { if (PyModule_AddObjectRef(mod, "__file__", filename) < 0) {
PyErr_Clear(); /* Not important enough to report */ PyErr_Clear(); /* Not important enough to report */