BUG24342757: Fix unclosed socket on connection failure

nmariz · nmariz · commit dc7d71a071e8 · 2017-07-10T11:42:33.000+01:00
Creating a Connection instance with use_pure=True and specifying an invalid
password causes a ResourceWarning, when using Python 3.5.2 with -b -Wall,
as the underlying socket is not closed in such a case.

This patch fixes this issue by closing the socket upon exception raised.
diff --git a/lib/mysql/connector/connection.py b/lib/mysql/connector/connection.py
@@ -91,7 +91,12 @@ def __init__(self, *args, **kwargs):
         self._pool_config_version = None
 
         if len(kwargs) > 0:
-            self.connect(**kwargs)
+            try:
+                self.connect(**kwargs)
+            except:
+                # Tidy-up underlying socket on failure
+                self.close()
+                raise
 
     def _do_handshake(self):
         """Get the handshake from the MySQL server"""
@@ -224,6 +229,7 @@ def shutdown(self):
             self._socket.shutdown()
         except (AttributeError, errors.Error):
             pass  # Getting an exception would mean we are disconnected.
+        self._socket = None
 
     def close(self):
         """Disconnect from the MySQL server"""
@@ -235,6 +241,8 @@ def close(self):
             self._socket.close_connection()
         except (AttributeError, errors.Error):
             pass  # Getting an exception would mean we are disconnected.
+        self._socket = None
+
     disconnect = close
 
     def _send_cmd(self, command, argument=None, packet_number=0, packet=None,
