summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2012-02-04 13:40:25 (GMT)
committerCharles-François Natali <neologix@free.fr>2012-02-04 13:40:25 (GMT)
commit709aa35a7a2e706d4c21b5ece772382853ae806c (patch)
tree2a0084dcf5ad071811ea022cd5cb50a0e34eb353 /Lib/multiprocessing
parent4c79aec7162a1f31c11cd754863908de696b6c64 (diff)
downloadcpython-709aa35a7a2e706d4c21b5ece772382853ae806c.zip
cpython-709aa35a7a2e706d4c21b5ece772382853ae806c.tar.gz
cpython-709aa35a7a2e706d4c21b5ece772382853ae806c.tar.bz2
Issue #8184: Fix a potential file descriptor leak when a
multiprocessing.Connection socket can't be bound.
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/connection.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 090796e..530a8df 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