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

[charles-francois.natali]

https://hg.python.org/cpython/rev/3bd0f2516445
changeset: 93029:3bd0f2516445
parent: 93023:c0224ff67cdd
parent: 93028:9c8016af2ed8
user: Charles-Fran?ois Natali <cf.natali at gmail.com>
date: Mon Oct 13 19:28:50 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
@@ -439,8 +439,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
@@ -270,6 +270,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
@@ -174,6 +174,8 @@
Library
-------

+- Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
+
- Issue #13096: Fixed segfault in CTypes POINTER handling of large
values.