From 58498bc7178608b1ab031994ca09c43889ce3e76 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Sun, 29 Sep 2019 15:00:35 +0300 Subject: bpo-38019: correctly handle pause/resume reading of closed asyncio unix pipe (GH-16472) --- Lib/asyncio/unix_events.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Lib/asyncio/unix_events.py') diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index cbbb1065ae..d8f653045a 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -445,6 +445,7 @@ class _UnixReadPipeTransport(transports.ReadTransport): self._fileno = pipe.fileno() self._protocol = protocol self._closing = False + self._paused = False mode = os.fstat(self._fileno).st_mode if not (stat.S_ISFIFO(mode) or @@ -506,10 +507,20 @@ class _UnixReadPipeTransport(transports.ReadTransport): self._loop.call_soon(self._call_connection_lost, None) def pause_reading(self): + if self._closing or self._paused: + return + self._paused = True self._loop._remove_reader(self._fileno) + if self._loop.get_debug(): + logger.debug("%r pauses reading", self) def resume_reading(self): + if self._closing or not self._paused: + return + self._paused = False self._loop._add_reader(self._fileno, self._read_ready) + if self._loop.get_debug(): + logger.debug("%r resumes reading", self) def set_protocol(self, protocol): self._protocol = protocol -- cgit v1.2.1