GH-125789: fix `fut._callbacks` to always return a copy of callbacks (#125922)

Fix `asyncio.Future._callbacks` to always return a copy of the internal list of callbacks to avoid mutation from user code affecting the internal state.
This commit is contained in:
Kumar Aditya 2024-10-25 18:19:30 +05:30 committed by GitHub
parent ebcc578dff
commit cae853e3b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 44 additions and 28 deletions

View File

@ -697,6 +697,24 @@ class CFutureTests(BaseFutureTests, test_utils.TestCase):
with self.assertRaises(AttributeError): with self.assertRaises(AttributeError):
del fut._log_traceback del fut._log_traceback
def test_callbacks_copy(self):
# See https://github.com/python/cpython/issues/125789
# In C implementation, the `_callbacks` attribute
# always returns a new list to avoid mutations of internal state
fut = self._new_future(loop=self.loop)
f1 = lambda _: 1
f2 = lambda _: 2
fut.add_done_callback(f1)
fut.add_done_callback(f2)
callbacks = fut._callbacks
self.assertIsNot(callbacks, fut._callbacks)
fut.remove_done_callback(f1)
callbacks = fut._callbacks
self.assertIsNot(callbacks, fut._callbacks)
fut.remove_done_callback(f2)
self.assertIsNone(fut._callbacks)
@unittest.skipUnless(hasattr(futures, '_CFuture'), @unittest.skipUnless(hasattr(futures, '_CFuture'),
'requires the C _asyncio module') 'requires the C _asyncio module')

View File

@ -0,0 +1 @@
Fix possible crash when mutating list of callbacks returned by :attr:`!asyncio.Future._callbacks`. It now always returns a new copy in C implementation :mod:`!_asyncio`. Patch by Kumar Aditya.

View File

@ -1265,52 +1265,49 @@ static PyObject *
FutureObj_get_callbacks(FutureObj *fut, void *Py_UNUSED(ignored)) FutureObj_get_callbacks(FutureObj *fut, void *Py_UNUSED(ignored))
{ {
asyncio_state *state = get_asyncio_state_by_def((PyObject *)fut); asyncio_state *state = get_asyncio_state_by_def((PyObject *)fut);
Py_ssize_t i;
ENSURE_FUTURE_ALIVE(state, fut) ENSURE_FUTURE_ALIVE(state, fut)
if (fut->fut_callback0 == NULL) { Py_ssize_t len = 0;
if (fut->fut_callbacks == NULL) { if (fut->fut_callback0 != NULL) {
Py_RETURN_NONE; len++;
}
return Py_NewRef(fut->fut_callbacks);
} }
Py_ssize_t len = 1;
if (fut->fut_callbacks != NULL) { if (fut->fut_callbacks != NULL) {
len += PyList_GET_SIZE(fut->fut_callbacks); len += PyList_GET_SIZE(fut->fut_callbacks);
} }
if (len == 0) {
Py_RETURN_NONE;
}
PyObject *new_list = PyList_New(len); PyObject *callbacks = PyList_New(len);
if (new_list == NULL) { if (callbacks == NULL) {
return NULL; return NULL;
} }
PyObject *tup0 = PyTuple_New(2); Py_ssize_t i = 0;
if (tup0 == NULL) { if (fut->fut_callback0 != NULL) {
Py_DECREF(new_list); PyObject *tup0 = PyTuple_New(2);
return NULL; if (tup0 == NULL) {
Py_DECREF(callbacks);
return NULL;
}
PyTuple_SET_ITEM(tup0, 0, Py_NewRef(fut->fut_callback0));
assert(fut->fut_context0 != NULL);
PyTuple_SET_ITEM(tup0, 1, Py_NewRef(fut->fut_context0));
PyList_SET_ITEM(callbacks, i, tup0);
i++;
} }
Py_INCREF(fut->fut_callback0);
PyTuple_SET_ITEM(tup0, 0, fut->fut_callback0);
assert(fut->fut_context0 != NULL);
Py_INCREF(fut->fut_context0);
PyTuple_SET_ITEM(tup0, 1, (PyObject *)fut->fut_context0);
PyList_SET_ITEM(new_list, 0, tup0);
if (fut->fut_callbacks != NULL) { if (fut->fut_callbacks != NULL) {
for (i = 0; i < PyList_GET_SIZE(fut->fut_callbacks); i++) { for (Py_ssize_t j = 0; j < PyList_GET_SIZE(fut->fut_callbacks); j++) {
PyObject *cb = PyList_GET_ITEM(fut->fut_callbacks, i); PyObject *cb = PyList_GET_ITEM(fut->fut_callbacks, j);
Py_INCREF(cb); Py_INCREF(cb);
PyList_SET_ITEM(new_list, i + 1, cb); PyList_SET_ITEM(callbacks, i, cb);
i++;
} }
} }
return new_list; return callbacks;
} }
static PyObject * static PyObject *