Skip to content

gh-150454: Fix wrong-interpreter return in import_run_extension error path #150455

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

Open
lpyu001 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

gh-150454: Fix wrong-interpreter return in import_run_extension error path #150455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2162,6 +2162,7 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,

struct _Py_ext_module_loader_result res;
int rc = _PyImport_RunModInitFunc(p0, info, &res);
bool main_error = false;
if (rc < 0) {
/* We discard res.def. */
assert(res.module == NULL);
Expand All @@ -2186,7 +2187,8 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
// obmalloc, so we create a copy here.
filename = _PyUnicode_Copy(info->filename);
if (filename == NULL) {
return NULL;
main_error = true;
goto main_finally;
}
}
else {
Expand Down Expand Up @@ -2232,6 +2234,7 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
main_tstate, info->path, info->name, def, &singlephase);
if (cached == NULL) {
assert(PyErr_Occurred());
main_error = true;
goto main_finally;
}
}
Expand All @@ -2247,7 +2250,7 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
// gh-144601: The exception object can't be transferred across
// interpreters. Instead, we print out an unraisable exception, and
// then raise a different exception for the calling interpreter.
if (rc < 0) {
if (rc < 0 || main_error) {
assert(PyErr_Occurred());
PyErr_FormatUnraisable("Exception while importing from subinterpreter");
}
Expand All @@ -2256,7 +2259,7 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
/* Any module we got from the init function will have to be
* reloaded in the subinterpreter. */
mod = NULL;
if (rc < 0) {
if (rc < 0 || main_error) {
PyErr_SetString(PyExc_ImportError,
"failed to import from subinterpreter due to exception");
goto error;
Expand All @@ -2271,6 +2274,9 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
if (rc < 0) {
goto error;
}
if (main_error) {
goto error;
}

if (res.kind == _Py_ext_module_kind_MULTIPHASE) {
assert_multiphase_def(def);
Expand Down
Loading