Merge branch '2.2' into 2.3

Documentation/Release-Notes/MaxScale-2.2.17-Release-Notes.md

@@ -1,4 +1,4 @@
-# MariaDB MaxScale 2.2.17 Release Notes
+# MariaDB MaxScale 2.2.17 Release Notes -- 2018-11-28
 
 Release 2.2.17 is a GA release.
 

server/core/utils.cc

@@ -1064,8 +1064,6 @@ int open_network_socket(enum mxs_socket_type type,
             memcpy(addr, ai->ai_addr, ai->ai_addrlen);
             set_port(addr, port);
 
-            freeaddrinfo(ai);
-
             if ((type == MXS_SOCKET_NETWORK && !configure_network_socket(so, addr->ss_family))
                 || (type == MXS_SOCKET_LISTENER && !configure_listener_socket(so)))
             {
@@ -1088,12 +1086,15 @@ int open_network_socket(enum mxs_socket_type type,
 
                 if (config->local_address)
                 {
+                    freeaddrinfo(ai);
+                    ai = NULL;
+
                     if ((rc = getaddrinfo(config->local_address, NULL, &hint, &ai)) == 0)
                     {
                         struct sockaddr_storage local_address = {};
 
                         memcpy(&local_address, ai->ai_addr, ai->ai_addrlen);
-                        freeaddrinfo(ai);
+
 
                         if (bind(so, (struct sockaddr*)&local_address, sizeof(local_address)) == 0)
                         {
@@ -1117,6 +1118,8 @@ int open_network_socket(enum mxs_socket_type type,
                 }
             }
         }
+
+        freeaddrinfo(ai);
     }
 
     return so;

server/modules/authenticator/MySQLAuth/dbusers.cc

@@ -226,7 +226,7 @@ static bool check_password(const char* output,
 
     /** Next, extract the SHA1 of the real password by XOR'ing it with
      * the output of the previous calculation */
-    uint8_t step2[SHA_DIGEST_LENGTH];
+    uint8_t step2[SHA_DIGEST_LENGTH] = {};
     gw_str_xor(step2, token, step1, token_len);
 
     /** The phase 2 scramble needs to be copied to the shared data structure as it