diff -r 4e9d899fcb65 Lib/test/test_asyncio/test_futures.py --- a/Lib/test/test_asyncio/test_futures.py Tue Dec 13 09:06:55 2016 -0800 +++ b/Lib/test/test_asyncio/test_futures.py Tue Dec 13 18:30:30 2016 -0500 @@ -569,6 +569,35 @@ self.assertEqual(bag, [2]) self.assertEqual(f.result(), 'foo') + def test_remove_done_callbacks_list_mutation(self): + # see http://bugs.python.org/issue28963 for details + + fut = self._new_future() + fut.add_done_callback(str) + + for _ in range(63): + fut.add_done_callback(id) + + class evil: + def __eq__(self, other): + fut.remove_done_callback(id) + return False + + fut.remove_done_callback(evil()) + + def test_schedule_callbacks_list_mutation(self): + # see http://bugs.python.org/issue28963 for details + + def mut(f): + f.remove_done_callback(str) + + fut = self._new_future() + fut.add_done_callback(mut) + fut.add_done_callback(str) + fut.add_done_callback(str) + fut.set_result(1) + test_utils.run_briefly(self.loop) + @unittest.skipUnless(hasattr(futures, '_CFuture'), 'requires the C _asyncio module') diff -r 4e9d899fcb65 Modules/_asynciomodule.c --- a/Modules/_asynciomodule.c Tue Dec 13 09:06:55 2016 -0800 +++ b/Modules/_asynciomodule.c Tue Dec 13 18:30:30 2016 -0500 @@ -522,7 +522,7 @@ return NULL; } - for (i = 0; i < len; i++) { + for (i = 0; i < PyList_GET_SIZE(self->fut_callbacks); i++) { int ret; PyObject *item = PyList_GET_ITEM(self->fut_callbacks, i);