diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2013-12-13 01:37:09 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2013-12-13 01:37:09 (GMT) |
commit | 66c6e9dcb4cea8cce36abbd95308aa15b3381bea (patch) | |
tree | 13f28d6fb2166c73a010000883647613d56819e3 /Lib/test/test_threading.py | |
parent | 9ffb1481d8103407d3d09d212993ab7c36c58087 (diff) | |
download | cpython-66c6e9dcb4cea8cce36abbd95308aa15b3381bea.zip cpython-66c6e9dcb4cea8cce36abbd95308aa15b3381bea.tar.gz cpython-66c6e9dcb4cea8cce36abbd95308aa15b3381bea.tar.bz2 |
Issue #14432: Generator now clears the borrowed reference to the thread state
Fix a crash when a generator is created in a C thread that is destroyed while
the generator is still used. The issue was that a generator contains a frame,
and the frame kept a reference to the Python state of the destroyed C thread.
The crash occurs when a trace function is setup.
Diffstat (limited to 'Lib/test/test_threading.py')
-rw-r--r-- | Lib/test/test_threading.py | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 71f84f6..41be68e 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -14,6 +14,10 @@ import unittest import weakref import os import subprocess +try: + import _testcapi +except ImportError: + _testcapi = None from test import lock_tests @@ -720,6 +724,45 @@ class ThreadJoinOnShutdown(BaseTestCase): for t in threads: t.join() + @unittest.skipIf(_testcapi is None, "need _testcapi module") + def test_frame_tstate_tracing(self): + # Issue #14432: Crash when a generator is created in a C thread that is + # destroyed while the generator is still used. The issue was that a + # generator contains a frame, and the frame kept a reference to the + # Python state of the destroyed C thread. The crash occurs when a trace + # function is setup. + + def noop_trace(frame, event, arg): + # no operation + return noop_trace + + def generator(): + while 1: + yield "genereator" + + def callback(): + if callback.gen is None: + callback.gen = generator() + return next(callback.gen) + callback.gen = None + + old_trace = sys.gettrace() + sys.settrace(noop_trace) + try: + # Install a trace function + threading.settrace(noop_trace) + + # Create a generator in a C thread which exits after the call + _testcapi.call_in_temporary_c_thread(callback) + + # Call the generator in a different Python thread, check that the + # generator didn't keep a reference to the destroyed thread state + for test in range(3): + # The trace function is still called here + callback() + finally: + sys.settrace(old_trace) + class ThreadingExceptionTests(BaseTestCase): # A RuntimeError should be raised if Thread.start() is called |