From 977c424ef6e806d9ae8e1c385c21811f1a050ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= Date: Mon, 13 Oct 2014 18:39:34 +0100 Subject: [PATCH] Issue #22435: Fix a file descriptor leak when SocketServer bind fails. --- Lib/SocketServer.py | 8 ++++++-- Lib/test/test_socketserver.py | 10 ++++++++++ Misc/NEWS | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index afb8686f732..23ce6fc3012 100644 --- a/Lib/SocketServer.py +++ b/Lib/SocketServer.py @@ -416,8 +416,12 @@ class TCPServer(BaseServer): self.socket = socket.socket(self.address_family, self.socket_type) if bind_and_activate: - self.server_bind() - self.server_activate() + try: + self.server_bind() + self.server_activate() + except: + self.server_close() + raise def server_bind(self): """Called by constructor to bind the socket. diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index 83f5e3f7207..8707017f3b2 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -314,6 +314,16 @@ class SocketServerTest(unittest.TestCase): for t, s in threads: t.join() + def test_tcpserver_bind_leak(self): + # Issue #22435: the server socket wouldn't be closed if bind()/listen() + # failed. + # Create many servers for which bind() will fail, to see if this result + # in FD exhaustion. + for i in range(1024): + with self.assertRaises(OverflowError): + SocketServer.TCPServer((HOST, -1), + SocketServer.StreamRequestHandler) + def test_main(): if imp.lock_held(): diff --git a/Misc/NEWS b/Misc/NEWS index 27a632213c1..62f3deb7774 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -19,6 +19,8 @@ Core and Builtins Library ------- +- Issue #22435: Fix a file descriptor leak when SocketServer bind fails. + - Issue #21580: Now Tkinter correctly handles binary "data" and "maskdata" configure options of tkinter.PhotoImage.