From a64b92edd3b7c9145e014aac9a15821d7b05b71a Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 29 Aug 2014 23:26:36 +0200 Subject: Issue #22185: Fix an occasional RuntimeError in threading.Condition.wait() caused by mutation of the waiters queue without holding the lock. Patch by Doug Zongker. --- Lib/threading.py | 11 ++++++----- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Lib/threading.py b/Lib/threading.py index 3407083..dfe9d41 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -284,6 +284,7 @@ class Condition: waiter.acquire() self._waiters.append(waiter) saved_state = self._release_save() + gotit = False try: # restore state no matter what (e.g., KeyboardInterrupt) if timeout is None: waiter.acquire() @@ -293,14 +294,14 @@ class Condition: gotit = waiter.acquire(True, timeout) else: gotit = waiter.acquire(False) - if not gotit: - try: - self._waiters.remove(waiter) - except ValueError: - pass return gotit finally: self._acquire_restore(saved_state) + if not gotit: + try: + self._waiters.remove(waiter) + except ValueError: + pass def wait_for(self, predicate, timeout=None): """Wait until a condition evaluates to True. diff --git a/Misc/ACKS b/Misc/ACKS index 4986dc6..5a388ff 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1500,4 +1500,5 @@ Cheng Zhang Kai Zhu Tarek Ziadé Gennadiy Zlobin +Doug Zongker Peter Åstrand diff --git a/Misc/NEWS b/Misc/NEWS index 854fc73..ab5eee6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -27,6 +27,10 @@ Core and Builtins Library ------- +- Issue #22185: Fix an occasional RuntimeError in threading.Condition.wait() + caused by mutation of the waiters queue without holding the lock. Patch + by Doug Zongker. + - Issue #22182: Use e.args to unpack exceptions correctly in distutils.file_util.move_file. Patch by Claudiu Popa. -- cgit v0.12