Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Jun 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6541086
Copy the filename into main interpreter before intern in import.c
aisk Jun 10, 2024
b6dd4e6
Only copy then switched
aisk Jun 10, 2024
455fe09
Add test
aisk Jun 16, 2024
eb1ab13
Update Python/import.c
kumaraditya303 Jun 17, 2024
3087ed5
Update Python/import.c
kumaraditya303 Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Lib/test/test_import/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2138,6 +2138,8 @@ def test_single_init_extension_compat(self):
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):
Expand Down
12 changes: 11 additions & 1 deletion Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
// obmaloc, so we create a copy here.
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
filename = PyUnicode_FromString(PyUnicode_AsUTF8(info->filename));
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
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 */
Expand Down
Loading