Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed a possible segfault during garbage collection of ``_asyncio.FutureIter`` objects
Comment thread
savannahostrowski marked this conversation as resolved.
18 changes: 16 additions & 2 deletions Modules/_asynciomodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1601,11 +1601,25 @@ static void
FutureIter_dealloc(futureiterobject *it)
{
PyTypeObject *tp = Py_TYPE(it);
asyncio_state *state = get_asyncio_state_by_def((PyObject *)it);

// FutureIter is a heap type so any subclass must also be a heap type.
Comment thread
savannahostrowski marked this conversation as resolved.
assert(_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE));

PyObject *module = ((PyHeapTypeObject*)tp)->ht_module;
asyncio_state *state = NULL;

PyObject_GC_UnTrack(it);
tp->tp_clear((PyObject *)it);

if (state->fi_freelist_len < FI_FREELIST_MAXLEN) {
// GH-115874: We can't use PyType_GetModuleByDef here as the type might have
// already been cleared, which is also why we must check if ht_module != NULL.
// Due to this restriction, subclasses that belong to a different module
Comment thread
savannahostrowski marked this conversation as resolved.
// will not be able to use the free list.
if (module && _PyModule_GetDef(module) == &_asynciomodule) {
Comment thread
brandtbucher marked this conversation as resolved.
state = get_asyncio_state(module);
}

if (state && state->fi_freelist_len < FI_FREELIST_MAXLEN) {
state->fi_freelist_len++;
it->future = (FutureObj*) state->fi_freelist;
state->fi_freelist = it;
Expand Down