From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 14 Jun 2012 21:22:02 +0000 (+0530)
Subject: [1828] Make code safer in case socket.socket() raises an exception
X-Git-Tag: trac2351_base~226^2~42^2~1^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e295b40a31dedb3671705ab44c2683624f3d541c;p=thirdparty%2Fkea.git

[1828] Make code safer in case socket.socket() raises an exception
---

diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index ce7d3b3ea6..0a9f1220b2 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -798,13 +798,13 @@ class UnixSockServer(socketserver_mixin.NoPollMixIn,
         '''Check whether the socket file 'sock_file' exists and
         is being used by one running xfrout process. If it is,
         return True, or else return False. '''
-        with socket.socket(socket.AF_UNIX) as sock:
-            try:
+        try:
+            with socket.socket(socket.AF_UNIX) as sock:
                 sock.connect(sock_file)
-            except socket.error as err:
-                return False
-            else:
-                return True
+        except socket.error as err:
+            return False
+        else:
+            return True
 
     def shutdown(self):
         self._write_sock.send(b"shutdown") #terminate the xfrout session thread