From: Charles-François Natali Date: Sat, 4 Feb 2012 13:40:25 +0000 (+0100) Subject: Issue #8184: Fix a potential file descriptor leak when a X-Git-Tag: v2.7.3rc1~94 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=709aa35a7a2e706d4c21b5ece772382853ae806c;p=python 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 090796ead3..530a8dfe4e 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