Skip to content

GH-97592: Fix crash in C remove_done_callback due to evil code #97660

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 4 commits into from
Sep 30, 2022
Merged

GH-97592: Fix crash in C remove_done_callback due to evil code #97660

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc55838
GH-97592: Anticipate fut_callbacks being cleared by PyObject_RichComp…
gvanrossum Sep 28, 2022
00b9536
Add test
gvanrossum Sep 29, 2022
648a617
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 29, 2022
a18d215
Add a link to the news
gvanrossum Sep 30, 2022
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
Next Next commit
GH-97592: Anticipate fut_callbacks being cleared by PyObject_RichComp… 
…areBool
  • Loading branch information
@gvanrossum
gvanrossum committed Sep 29, 2022
commit bc55838096bcc8bde06d0c7d6ec6fc8fa571e7ed
9 changes: 7 additions & 2 deletions Modules/_asynciomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,11 @@ _asyncio_Future_remove_done_callback(FutureObj *self, PyObject *fn)
return NULL;
}

for (i = 0; i < PyList_GET_SIZE(self->fut_callbacks); i++) {
// Beware: PyObject_RichCompareBool below may change fut_callbacks.
// See GH-97592.
for (i = 0;
self->fut_callbacks != NULL && i < PyList_GET_SIZE(self->fut_callbacks);
i++) {
int ret;
PyObject *item = PyList_GET_ITEM(self->fut_callbacks, i);
Py_INCREF(item);
Expand All @@ -1071,7 +1075,8 @@ _asyncio_Future_remove_done_callback(FutureObj *self, PyObject *fn)
}
}

if (j == 0) {
// Note: fut_callbacks may have been cleared.
if (j == 0 || self->fut_callbacks == NULL) {
Py_CLEAR(self->fut_callbacks);
Py_DECREF(newlist);
return PyLong_FromSsize_t(len + cleared_callback0);
Expand Down