mirror of https://github.com/python/cpython
[3.13] gh-115649: Copy the filename into main interpreter before intern in import.c (GH-120315) (#120652)
gh-115649: Copy the filename into main interpreter before intern in import.c (GH-120315)
(cherry picked from commit 28140d1f2d
)
Co-authored-by: AN Long <aisk@users.noreply.github.com>
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
This commit is contained in:
parent
f7ba3233a2
commit
9172bc35c6
|
@ -2157,6 +2157,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):
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue