[Python-checkins] cpython (2.7): Issue #8184: Fix a potential file descriptor leak when a
charles-francois.natali
python-checkins at python.org
Sat Feb 4 15:13:10 CET 2012
http://hg.python.org/cpython/rev/887d0ab5fb97
changeset: 74758:887d0ab5fb97
branch: 2.7
parent: 74751:93cfb0bff87a
user: Charles-François Natali <neologix at free.fr>
date: Sat Feb 04 14:40:25 2012 +0100
summary:
Issue #8184: Fix a potential file descriptor leak when a
multiprocessing.Connection socket can't be bound.
files:
Lib/multiprocessing/connection.py | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list