From: Charles-François Natali <neologix@free.fr>
Date: Sat, 4 Feb 2012 13:55:53 +0000 (+0100)
Subject: Issue #8184: Fix a potential file descriptor leak when a
X-Git-Tag: v3.2.3rc1~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=992ca5278ec1d7529c4aeedfed74051890feac1b;p=thirdparty%2FPython%2Fcpython.git

Issue #8184: Fix a potential file descriptor leak when a
multiprocessing.Connection socket can't be bound.
---

diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index d6c23fb0ecdf..df00f1d90664 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -249,10 +249,14 @@ class SocketListener(object):
     '''
     def __init__(self, address, family, backlog=1):
         self._socket = socket.socket(getattr(socket, family))
-        self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self._socket.bind(address)
-        self._socket.listen(backlog)
-        self._address = self._socket.getsockname()
+        try:
+            self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            self._socket.bind(address)
+            self._socket.listen(backlog)
+            self._address = self._socket.getsockname()
+        except socket.error:
+            self._socket.close()
+            raise
         self._family = family
         self._last_accepted = None