Issue #21119: asyncio: Make sure that socketpair() close sockets on error
Close the listening socket if sock.bind() raises an exception.
diff --git a/Lib/asyncio/windows_utils.py b/Lib/asyncio/windows_utils.py
index 2a196cc..f7f2f35 100644
--- a/Lib/asyncio/windows_utils.py
+++ b/Lib/asyncio/windows_utils.py
@@ -51,23 +51,25 @@
# We create a connected TCP socket. Note the trick with setblocking(0)
# that prevents us from having to create a thread.
lsock = socket.socket(family, type, proto)
- lsock.bind((host, 0))
- lsock.listen(1)
- # On IPv6, ignore flow_info and scope_id
- addr, port = lsock.getsockname()[:2]
- csock = socket.socket(family, type, proto)
- csock.setblocking(False)
try:
- csock.connect((addr, port))
- except (BlockingIOError, InterruptedError):
- pass
- except Exception:
+ lsock.bind((host, 0))
+ lsock.listen(1)
+ # On IPv6, ignore flow_info and scope_id
+ addr, port = lsock.getsockname()[:2]
+ csock = socket.socket(family, type, proto)
+ try:
+ csock.setblocking(False)
+ try:
+ csock.connect((addr, port))
+ except (BlockingIOError, InterruptedError):
+ pass
+ ssock, _ = lsock.accept()
+ csock.setblocking(True)
+ except:
+ csock.close()
+ raise
+ finally:
lsock.close()
- csock.close()
- raise
- ssock, _ = lsock.accept()
- csock.setblocking(True)
- lsock.close()
return (ssock, csock)