Skip to content

Commit

Permalink
pythongh-124160: Pass main_tstate to update_global_state_for_extensio…
Browse files Browse the repository at this point in the history
…n() (pythonGH-124164)

(cherry picked from commit 7331d0f)

Co-authored-by: luk1337 <priv.luk@gmail.com>
  • Loading branch information
luk1337 authored and miss-islington committed Sep 19, 2024
1 parent 112b170 commit de74ce9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix crash when importing modules containing state and single-phase
initialization in a subinterpreter.
9 changes: 9 additions & 0 deletions Programs/_testembed.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ static void _testembed_Py_Initialize(void)
}


static int test_import_in_subinterpreters(void)
{
_testembed_Py_InitializeFromConfig();
PyThreadState_Swap(Py_NewInterpreter());
return PyRun_SimpleString("import readline"); // gh-124160
}


/*****************************************************
* Test repeated initialisation and subinterpreters
*****************************************************/
Expand Down Expand Up @@ -2184,6 +2192,7 @@ static struct TestCase TestCases[] = {
{"test_repeated_init_exec", test_repeated_init_exec},
{"test_repeated_simple_init", test_repeated_simple_init},
{"test_forced_io_encoding", test_forced_io_encoding},
{"test_import_in_subinterpreters", test_import_in_subinterpreters},
{"test_repeated_init_and_subinterpreters", test_repeated_init_and_subinterpreters},
{"test_repeated_init_and_inittab", test_repeated_init_and_inittab},
{"test_pre_initialization_api", test_pre_initialization_api},
Expand Down
2 changes: 1 addition & 1 deletion Python/import.c
Original file line number Diff line number Diff line change
Expand Up @@ -2044,7 +2044,7 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
singlephase.m_init = p0;
}
cached = update_global_state_for_extension(
tstate, info->path, info->name, def, &singlephase);
main_tstate, info->path, info->name, def, &singlephase);
if (cached == NULL) {
assert(PyErr_Occurred());
goto main_finally;
Expand Down

0 comments on commit de74ce9

Please sign in to comment.