]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-34970: Protect tasks weak set manipulation in asyncio.all_tasks() (GH-9837) ...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 13 Oct 2018 19:26:47 +0000 (12:26 -0700)
committerNed Deily <nad@python.org>
Sat, 20 Oct 2018 04:37:51 +0000 (00:37 -0400)
https://bugs.python.org/issue34970
(cherry picked from commit 97cf0828727ac2a269c89c5aa09570a69a22c83c)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
Lib/asyncio/tasks.py
Misc/NEWS.d/next/Library/2018-10-13-11-14-13.bpo-34970.SrJTY7.rst [new file with mode: 0644]

index 72792a25cf55acc721346d4acacea5c235c73ee5..416c346be2ecd17b8bc8e020a985b33f9ecca181 100644 (file)
@@ -35,7 +35,9 @@ def all_tasks(loop=None):
     """Return a set of all tasks for the loop."""
     if loop is None:
         loop = events.get_running_loop()
-    return {t for t in _all_tasks
+    # NB: set(_all_tasks) is required to protect
+    # from https://bugs.python.org/issue34970 bug
+    return {t for t in list(_all_tasks)
             if futures._get_loop(t) is loop and not t.done()}
 
 
@@ -45,7 +47,9 @@ def _all_tasks_compat(loop=None):
     # method.
     if loop is None:
         loop = events.get_event_loop()
-    return {t for t in _all_tasks if futures._get_loop(t) is loop}
+    # NB: set(_all_tasks) is required to protect
+    # from https://bugs.python.org/issue34970 bug
+    return {t for t in list(_all_tasks) if futures._get_loop(t) is loop}
 
 
 class Task(futures._PyFuture):  # Inherit Python Task implementation
diff --git a/Misc/NEWS.d/next/Library/2018-10-13-11-14-13.bpo-34970.SrJTY7.rst b/Misc/NEWS.d/next/Library/2018-10-13-11-14-13.bpo-34970.SrJTY7.rst
new file mode 100644 (file)
index 0000000..a58b3dd
--- /dev/null
@@ -0,0 +1 @@
+Protect tasks weak set manipulation in ``asyncio.all_tasks()``