[Python-checkins] cpython (3.4): Issue #22435: Fix a file descriptor leak when SocketServer bind fails.

Mon Oct 13 20:33:08 CEST 2014

https://hg.python.org/cpython/rev/9c8016af2ed8
changeset: 93028:9c8016af2ed8
branch: 3.4
parent: 93019:d686de84dc10
user: Charles-François Natali <cf.natali at gmail.com>
date: Mon Oct 13 19:19:26 2014 +0100
summary:
 Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
files:
 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
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -426,8 +426,12 @@
 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
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -302,6 +302,16 @@
 t.join()
 s.server_close()
 
+ 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@
 Library
 -------
 
+- Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
+
 - Issue #13096: Fixed segfault in CTypes POINTER handling of large
 values.
 
-- 
Repository URL: https://hg.python.org/cpython
