changeset:   93024:437002018d2d
branch:      2.7
parent:      91998:46c7a724b487
user:        Charles-François Natali <cf.natali@gmail.com>
date:        Mon Oct 13 18:39:34 2014 +0100
files:       Lib/SocketServer.py Lib/test/test_socketserver.py Misc/NEWS
description:
Issue #22435: Fix a file descriptor leak when SocketServer bind fails.


diff -r 46c7a724b487 -r 437002018d2d Lib/SocketServer.py
--- a/Lib/SocketServer.py	Mon Aug 04 19:34:29 2014 +0300
+++ b/Lib/SocketServer.py	Mon Oct 13 18:39:34 2014 +0100
@@ -416,8 +416,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 -r 46c7a724b487 -r 437002018d2d Lib/test/test_socketserver.py
--- a/Lib/test/test_socketserver.py	Mon Aug 04 19:34:29 2014 +0300
+++ b/Lib/test/test_socketserver.py	Mon Oct 13 18:39:34 2014 +0100
@@ -314,6 +314,16 @@
         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 -r 46c7a724b487 -r 437002018d2d Misc/NEWS
--- a/Misc/NEWS	Mon Aug 04 19:34:29 2014 +0300
+++ b/Misc/NEWS	Mon Oct 13 18:39:34 2014 +0100
@@ -19,6 +19,8 @@
 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.