Skip to content

gh-130221: fix crash when accessing module state while interp is finalizing in asyncio #130245

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

Merged
merged 1 commit into from
Feb 19, 2025
Merged

gh-130221: fix crash when accessing module state while interp is finalizing in asyncio #130245

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
22 changes: 9 additions & 13 deletions Modules/_asynciomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static PyObject * future_new_iter(PyObject *);

static PyObject *
task_step_handle_result_impl(asyncio_state *state, TaskObj *task, PyObject *result);

static void unregister_task(TaskObj *task);

static void
clear_task_coro(TaskObj *task)
Expand Down Expand Up @@ -413,7 +413,6 @@ future_ensure_alive(FutureObj *fut)
} \
} while(0);

static void unregister_task(asyncio_state *state, TaskObj *task);

static int
future_schedule_callbacks(asyncio_state *state, FutureObj *fut)
Expand All @@ -426,7 +425,7 @@ future_schedule_callbacks(asyncio_state *state, FutureObj *fut)
// remove task from linked-list of tasks
// as it is finished now
TaskObj *task = (TaskObj *)fut;
unregister_task(state, task);
unregister_task(task);
}

if (fut->fut_callback0 != NULL) {
Expand Down Expand Up @@ -2175,9 +2174,8 @@ static PyMethodDef TaskWakeupDef = {
/* ----- Task introspection helpers */

static void
register_task(asyncio_state *state, TaskObj *task)
register_task(TaskObj *task)
{
assert(Task_Check(state, task));
if (task->task_node.next != NULL) {
// already registered
assert(task->task_node.prev != NULL);
Expand Down Expand Up @@ -2206,9 +2204,8 @@ unregister_task_safe(TaskObj *task)
}

static void
unregister_task(asyncio_state *state, TaskObj *task)
unregister_task(TaskObj *task)
{
assert(Task_Check(state, task));
#ifdef Py_GIL_DISABLED
// check if we are in the same thread
// if so, we can avoid locking
Expand Down Expand Up @@ -2490,7 +2487,7 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop,
// works correctly in non-owning threads.
_PyObject_SetMaybeWeakref((PyObject *)self);
#endif
register_task(state, self);
register_task(self);
return 0;
}

Expand Down Expand Up @@ -3075,8 +3072,7 @@ TaskObj_dealloc(PyObject *self)
_PyObject_ResurrectStart(self);
// Unregister the task here so that even if any subclass of Task
// which doesn't end up calling TaskObj_finalize not crashes.
asyncio_state *state = get_asyncio_state_by_def(self);
unregister_task(state, task);
unregister_task(task);

PyObject_CallFinalizer(self);

Expand Down Expand Up @@ -3613,7 +3609,7 @@ task_eager_start(asyncio_state *state, TaskObj *task)
}

if (task->task_state == STATE_PENDING) {
register_task(state, task);
register_task(task);
} else {
// This seems to really help performance on pyperformance benchmarks
clear_task_coro(task);
Expand Down Expand Up @@ -3804,7 +3800,7 @@ _asyncio__register_task_impl(PyObject *module, PyObject *task)
if (Task_Check(state, task)) {
// task is an asyncio.Task instance or subclass, use efficient
// linked-list implementation.
register_task(state, (TaskObj *)task);
register_task((TaskObj *)task);
Py_RETURN_NONE;
}
// As task does not inherit from asyncio.Task, fallback to less efficient
Expand Down Expand Up @@ -3856,7 +3852,7 @@ _asyncio__unregister_task_impl(PyObject *module, PyObject *task)
{
asyncio_state *state = get_asyncio_state(module);
if (Task_Check(state, task)) {
unregister_task(state, (TaskObj *)task);
unregister_task((TaskObj *)task);
Py_RETURN_NONE;
}
PyObject *res = PyObject_CallMethodOneArg(state->non_asyncio_tasks,
Expand Down
Loading