(original) (raw)

changeset: 74759:ba1e0a1ac5b7 branch: 3.2 parent: 74752:e35f1c431302 user: Charles-François Natali neologix@free.fr date: Sat Feb 04 14:55:53 2012 +0100 files: Lib/multiprocessing/connection.py description: Issue #8184: Fix a potential file descriptor leak when a multiprocessing.Connection socket can't be bound. diff -r e35f1c431302 -r ba1e0a1ac5b7 Lib/multiprocessing/connection.py --- a/Lib/multiprocessing/connection.py Fri Feb 03 19:22:31 2012 -0500 +++ b/Lib/multiprocessing/connection.py Sat Feb 04 14:55:53 2012 +0100 @@ -249,10 +249,14 @@ ''' 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 /neologix@free.fr