From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 15 Mar 2022 15:23:47 +0000 (-0700)
Subject: bpo-43253: Don't call shutdown() for invalid socket handles (GH-31892)
X-Git-Tag: v3.9.11~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64a68c39cb508b016e5a4486ebb4052f6e65fca0;p=thirdparty%2FPython%2Fcpython.git

bpo-43253: Don't call shutdown() for invalid socket handles (GH-31892)

(cherry picked from commit 70155412f1543f100d4aa309b8691cbcabd3e0e1)

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
---

diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index 6762253abc96..e3f95cf21d61 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -158,7 +158,7 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin,
             # end then it may fail with ERROR_NETNAME_DELETED if we
             # just close our end.  First calling shutdown() seems to
             # cure it, but maybe using DisconnectEx() would be better.
-            if hasattr(self._sock, 'shutdown'):
+            if hasattr(self._sock, 'shutdown') and self._sock.fileno() != -1:
                 self._sock.shutdown(socket.SHUT_RDWR)
             self._sock.close()
             self._sock = None
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index 1bbb487626e8..acf21494823a 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -237,6 +237,14 @@ class ProactorSocketTransportTests(test_utils.TestCase):
         test_utils.run_briefly(self.loop)
         self.assertFalse(self.protocol.connection_lost.called)
 
+    def test_close_invalid_sockobj(self):
+        tr = self.socket_transport()
+        self.sock.fileno.return_value = -1
+        tr.close()
+        test_utils.run_briefly(self.loop)
+        self.protocol.connection_lost.assert_called_with(None)
+        self.assertFalse(self.sock.shutdown.called)
+
     @mock.patch('asyncio.base_events.logger')
     def test_fatal_error(self, m_logging):
         tr = self.socket_transport()
diff --git a/Misc/NEWS.d/next/Library/2022-03-15-07-53-45.bpo-43253.rjdLFj.rst b/Misc/NEWS.d/next/Library/2022-03-15-07-53-45.bpo-43253.rjdLFj.rst
new file mode 100644
index 000000000000..b9920cb821b3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-03-15-07-53-45.bpo-43253.rjdLFj.rst
@@ -0,0 +1 @@
+Fix a crash when closing transports where the underlying socket handle is already invalid on the Proactor event loop.