bpo-31061: fix crash in asyncio speedup module (GH-2984)

methane · web-flow · commit f142e85d22ba · 2017-08-02T16:50:39.000+09:00
(cherry picked from commit de34cbe)
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
@@ -1,6 +1,7 @@
 """Tests for futures.py."""
 
 import concurrent.futures
+import gc
 import re
 import sys
 import threading
@@ -19,9 +20,11 @@
 def _fakefunc(f):
     return f
 
+
 def first_cb():
     pass
 
+
 def last_cb():
     pass
 
@@ -483,6 +486,15 @@ def test_future_iter_throw(self):
                           Exception("elephant"), Exception("elephant"))
         self.assertRaises(TypeError, fi.throw, list)
 
+    def test_future_del_collect(self):
+        class Evil:
+            def __del__(self):
+                gc.collect()
+
+        for i in range(100):
+            fut = self._new_future(loop=self.loop)
+            fut.set_result(Evil())
+
 
 @unittest.skipUnless(hasattr(futures, '_CFuture'),
                      'requires the C _asyncio module')
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
@@ -3,6 +3,7 @@
 import collections
 import contextlib
 import functools
+import gc
 import io
 import os
 import re
@@ -92,6 +93,20 @@ def setUp(self):
         self.loop.set_task_factory(self.new_task)
         self.loop.create_future = lambda: self.new_future(self.loop)
 
+    def test_task_del_collect(self):
+        class Evil:
+            def __del__(self):
+                gc.collect()
+
+        @asyncio.coroutine
+        def run():
+            return Evil()
+
+        self.loop.run_until_complete(
+            asyncio.gather(*[
+                self.new_task(self.loop, run()) for _ in range(100)
+            ], loop=self.loop))
+
     def test_other_loop_future(self):
         other_loop = asyncio.new_event_loop()
         fut = self.new_future(other_loop)
diff --git a/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst b/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst
@@ -0,0 +1 @@
+Fixed a crash when using asyncio and threads.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
@@ -971,6 +971,8 @@ FutureObj_dealloc(PyObject *self)
         }
     }
 
+    PyObject_GC_UnTrack(self);
+
     if (fut->fut_weakreflist != NULL) {
         PyObject_ClearWeakRefs(self);
     }
@@ -1845,6 +1847,8 @@ TaskObj_dealloc(PyObject *self)
         }
     }
 
+    PyObject_GC_UnTrack(self);
+
     if (task->task_weakreflist != NULL) {
         PyObject_ClearWeakRefs(self);
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fixed a crash when using asyncio and threads.`
Original file line number	Diff line number	Diff line change
`@@ -971,6 +971,8 @@ FutureObj_dealloc(PyObject *self)`
`971`	`971`	`}`
`972`	`972`	`}`
`973`	`973`
	`974`	`+ PyObject_GC_UnTrack(self);`
	`975`	`+`
`974`	`976`	`if (fut->fut_weakreflist != NULL) {`
`975`	`977`	`PyObject_ClearWeakRefs(self);`
`976`	`978`	`}`
`@@ -1845,6 +1847,8 @@ TaskObj_dealloc(PyObject *self)`
`1845`	`1847`	`}`
`1846`	`1848`	`}`
`1847`	`1849`
	`1850`	`+ PyObject_GC_UnTrack(self);`
	`1851`	`+`
`1848`	`1852`	`if (task->task_weakreflist != NULL) {`
`1849`	`1853`	`PyObject_ClearWeakRefs(self);`
`1850`	`1854`	`}`