diff options
| author | Charles-François Natali <cf.natali@gmail.com> | 2014-10-13 17:39:34 (GMT) |
|---|---|---|
| committer | Charles-François Natali <cf.natali@gmail.com> | 2014-10-13 17:39:34 (GMT) |
| commit | 977c424ef6e806d9ae8e1c385c21811f1a050ac8 (patch) | |
| tree | e63ad75e0aba5f71ad582e29aeb2400c11b620a8 /Lib/SocketServer.py | |
| parent | c468abafc7a8690be365d1eb192c4551b03c2856 (diff) | |
| download | cpython-977c424ef6e806d9ae8e1c385c21811f1a050ac8.zip cpython-977c424ef6e806d9ae8e1c385c21811f1a050ac8.tar.gz cpython-977c424ef6e806d9ae8e1c385c21811f1a050ac8.tar.bz2 | |
Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
Diffstat (limited to 'Lib/SocketServer.py')
| -rw-r--r-- | Lib/SocketServer.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index afb8686..23ce6fc 100644 --- a/Lib/SocketServer.py +++ b/Lib/SocketServer.py @@ -416,8 +416,12 @@ class TCPServer(BaseServer): self.socket = socket.socket(self.address_family, self.socket_type) if bind_and_activate: - self.server_bind() - self.server_activate() + try: + self.server_bind() + self.server_activate() + except: + self.server_close() + raise def server_bind(self): """Called by constructor to bind the socket. |