diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-05 13:29:41 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-05 13:29:41 (GMT) |
| commit | a9acbe82e7822e555b669139fdd8a7cb7667492c (patch) | |
| tree | 6d0d3962f744ab352e231cc2aba1874531f947bb /Lib/asyncio/selector_events.py | |
| parent | 5021cb553c2c6bf7219882c36b9f6b2bdee5bd24 (diff) | |
| download | cpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.zip cpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.tar.gz cpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.tar.bz2 | |
Closes #21886, #21447: Fix a race condition in asyncio when setting the result
of a Future with call_soon(). Add an helper, a private method, to set the
result only if the future was not cancelled.
Diffstat (limited to 'Lib/asyncio/selector_events.py')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index df64aec..2a17034 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -481,7 +481,7 @@ class _SelectorSocketTransport(_SelectorTransport): self._loop.add_reader(self._sock_fd, self._read_ready) self._loop.call_soon(self._protocol.connection_made, self) if waiter is not None: - self._loop.call_soon(waiter.set_result, None) + self._loop.call_soon(waiter._set_result_unless_cancelled, None) def pause_reading(self): if self._closing: @@ -690,7 +690,8 @@ class _SelectorSslTransport(_SelectorTransport): self._loop.add_reader(self._sock_fd, self._read_ready) self._loop.call_soon(self._protocol.connection_made, self) if self._waiter is not None: - self._loop.call_soon(self._waiter.set_result, None) + self._loop.call_soon(self._waiter._set_result_unless_cancelled, + None) def pause_reading(self): # XXX This is a bit icky, given the comment at the top of |