Fix asan error:

Don't initialize mysql connection handle before
checking skip conditions

Author: 9EOR9

unittest/libmariadb/connection.c

@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 static int test_conc66(MYSQL *my)
 {
-  MYSQL *mysql= mysql_init(NULL);
+  MYSQL *mysql;
   int rc;
   FILE *fp;
   char query[1024];
@@ -54,31 +54,33 @@ static int test_conc66(MYSQL *my)
 
   fclose(fp);
 
-  rc= mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "conc-66");
-  check_mysql_rc(rc, mysql);
-  rc= mysql_options(mysql, MYSQL_READ_DEFAULT_FILE, "./my-conc66-test.cnf");
-  check_mysql_rc(rc, mysql);
-
   sprintf(query, "GRANT ALL ON %s.* TO 'conc66'@'%s' IDENTIFIED BY 'test@A1\";#test'", schema, this_host ? this_host : "localhost");
   rc= mysql_query(my, query);
   check_mysql_rc(rc, my);
   rc= mysql_query(my, "FLUSH PRIVILEGES");
   check_mysql_rc(rc, my);
+  mysql= mysql_init(NULL);
+
+  rc= mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "conc-66");
+  check_mysql_rc(rc, mysql);
+  rc= mysql_options(mysql, MYSQL_READ_DEFAULT_FILE, "./my-conc66-test.cnf");
+  check_mysql_rc(rc, mysql);
+
   if (!my_test_connect(mysql, hostname, NULL,
                              NULL, schema, port, socketname, 0))
   {
     diag("user: %s", mysql->options.user);
     diag("Error: %s", mysql_error(mysql));
     return FAIL;
   }
-    diag("user: %s", mysql->options.user);
-  
+  diag("user: %s", mysql->options.user);
+
   sprintf(query, "DROP user 'conc66'@'%s'", this_host ? this_host : "localhost");
   rc= mysql_query(my, query);
 
   check_mysql_rc(rc, my);
   mysql_close(mysql);
-  return OK; 
+  return OK;
 }
 
 static int test_bug20023(MYSQL *mysql)
@@ -463,9 +465,9 @@ static int test_bug31669(MYSQL *mysql)
 static int test_bug33831(MYSQL *mysql)
 {
   FAIL_IF(my_test_connect(mysql, hostname, username,
-                             password, schema, port, socketname, 0), 
+                             password, schema, port, socketname, 0),
          "Error expected");
-  
+
   return OK;
 }
 
@@ -477,8 +479,6 @@ static int test_opt_reconnect(MYSQL *mysql)
   int rc;
   my_bool reconnect;
 
-  printf("true: %d\n", TRUE);
-
   mysql= mysql_init(NULL);
   FAIL_IF(!mysql, "not enough memory");
 
@@ -632,7 +632,7 @@ int test_conc21(MYSQL *mysql)
   row= mysql_fetch_row(res);
   strcpy(tmp, row[0]);
   mysql_free_result(res);
-  
+
   sscanf(tmp, "%d.%d.%d", &major, &minor, &patch);
 
   check_server_version= major * 10000 + minor * 100 + patch;
@@ -658,7 +658,7 @@ int test_conc26(MYSQL *unused __attribute__((unused)))
   mysql_close(mysql);
 
   mysql= mysql_init(NULL);
-  FAIL_IF(my_test_connect(mysql, hostname, "notexistinguser", "password", schema, port, socketname, 0), 
+  FAIL_IF(my_test_connect(mysql, hostname, "notexistinguser", "password", schema, port, socketname, 0),
           "Error expected");
   FAIL_IF(mysql->options.charset_name, "Error: options not freed");
   mysql_close(mysql);
@@ -676,6 +676,7 @@ int test_connection_timeout(MYSQL *unused __attribute__((unused)))
   if (my_test_connect(mysql, "192.168.1.101", "notexistinguser", "password", schema, port, socketname, CLIENT_REMEMBER_OPTIONS))
   {
     diag("Error expected - maybe you have to change hostname");
+    mysql_close(mysql);
     return FAIL;
   }
   elapsed= time(NULL) - start;
@@ -704,6 +705,7 @@ int test_connection_timeout2(MYSQL *unused __attribute__((unused)))
   elapsed= time(NULL) - start;
   diag("elapsed: %lu", (unsigned long)elapsed);
     diag("timeout error expected");
+    mysql_close(mysql);
     return FAIL;
   }
   elapsed= time(NULL) - start;
@@ -730,6 +732,7 @@ int test_connection_timeout3(MYSQL *unused __attribute__((unused)))
     diag("timeout error expected");
     elapsed= time(NULL) - start;
     diag("elapsed: %lu", (unsigned long)elapsed);
+    mysql_close(mysql);
     return FAIL;
   }
   elapsed= time(NULL) - start;
@@ -745,6 +748,7 @@ int test_connection_timeout3(MYSQL *unused __attribute__((unused)))
   if (!my_test_connect(mysql, hostname, username, password, schema, port, socketname, CLIENT_REMEMBER_OPTIONS))
   {
     diag("Error: %s", mysql_error(mysql));
+    mysql_close(mysql);
     return FAIL;
   }
 
@@ -798,7 +802,7 @@ static int test_wrong_bind_address(MYSQL *unused __attribute__((unused)))
     diag("test doesn't work with unix sockets");
     return SKIP;
   }
- 
+
   mysql=  mysql_init(NULL);
 
   mysql_options(mysql, MYSQL_OPT_BIND, bind_addr);
@@ -868,7 +872,7 @@ static int test_get_options(MYSQL *unused __attribute__((unused)))
                       MYSQL_OPT_PROTOCOL, MYSQL_OPT_READ_TIMEOUT, MYSQL_OPT_WRITE_TIMEOUT, 0};
   my_bool options_bool[]= {MYSQL_OPT_RECONNECT, MYSQL_REPORT_DATA_TRUNCATION,
                            MYSQL_OPT_COMPRESS, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_SECURE_AUTH,
-#ifdef _WIN32    
+#ifdef _WIN32
     MYSQL_OPT_NAMED_PIPE,
 #endif
                           0};
@@ -911,7 +915,7 @@ static int test_get_options(MYSQL *unused __attribute__((unused)))
     mysql_options(mysql, options_char[i], char1);
     char2= NULL;
     mysql_get_optionv(mysql, options_char[i], (void *)&char2);
-    if (options_char[i] != MYSQL_SET_CHARSET_NAME) 
+    if (options_char[i] != MYSQL_SET_CHARSET_NAME)
       FAIL_IF(strcmp(char1, char2), "mysql_get_optionv (char) failed");
   }
 
@@ -1048,7 +1052,7 @@ static int test_conc496(MYSQL *mysql)
   rc= mysql_query(mysql, "CREATE TEMPORARY TABLE t1(a int) ENGINE=InnoDB");
   check_mysql_rc(rc, mysql);
   rc= mysql_query(mysql, "COMMIT");
-  
+
   check_mysql_rc(rc, mysql);
 
   if (!mysql_session_track_get_first(mysql, SESSION_TRACK_TRANSACTION_STATE, &data, &len))
@@ -1126,7 +1130,7 @@ static int test_reset(MYSQL *mysql)
   check_mysql_rc(rc, mysql);
 
   rc= mysql_query(mysql, "SELECT 1 FROM DUAL");
-  FAIL_IF(!rc, "Error expected"); 
+  FAIL_IF(!rc, "Error expected");
 
   rc= mysql_reset_connection(mysql);
   check_mysql_rc(rc, mysql);
@@ -1555,11 +1559,11 @@ static int test_conc327(MYSQL *unused __attribute__((unused)))
       fclose(fp2);
     }
   }
-  
+
   FAIL_IF(failed_opening_files, "fopen failed");
 
   fprintf(fp1, "!include %s\n", cnf_file2);
-  
+
   fprintf(fp2, "[client]\ndefault-character-set = latin2\nreconnect= 1\n");
   fclose(fp1);
   fclose(fp2);
@@ -1595,7 +1599,7 @@ static int test_conc327(MYSQL *unused __attribute__((unused)))
   FAIL_IF(failed_opening_files, "fopen failed");
 
   fprintf(fp2, "!includedir %s\n", env);
-  
+
   fprintf(fp1, "[client]\ndefault-character-set = latin2\nreconnect= 1\n");
   fclose(fp1);
   fclose(fp2);
@@ -1709,7 +1713,7 @@ static int test_conc312(MYSQL *my)
   {
     diag("Error: %s", mysql_error(my));
     diag("caching_sha256_password not supported");
-    return SKIP; 
+    return SKIP;
   }
 
   sprintf(query, "GRANT ALL ON %s.* TO 'foo'@'%s'", schema, this_host);
@@ -1724,7 +1728,7 @@ static int test_conc312(MYSQL *my)
   }
 
   mysql_close(mysql);
-  
+
   sprintf(query, "DROP USER 'foo'@'%s'", this_host);
   rc= mysql_query(my, query);
   check_mysql_rc(rc, mysql);
@@ -1808,7 +1812,7 @@ static int test_conc392(MYSQL *mysql)
     diag("Server doesn't support session tracking (cap=%lu)", mysql->server_capabilities);
     return SKIP;
   }
-  
+
   rc= mysql_query(mysql, "set session_track_state_change=1");
   check_mysql_rc(rc, mysql);
 
@@ -1817,7 +1821,7 @@ static int test_conc392(MYSQL *mysql)
     diag("session_track_get_first failed");
     return FAIL;
   }
-  
+
   FAIL_IF(len != 1, "Expected length 1");
   return OK;
 }
@@ -1900,7 +1904,7 @@ static int test_default_auth(MYSQL *my __attribute__((unused)))
     diag("Connection failed. Error: %s", mysql_error(mysql));
     mysql_close(mysql);
     return FAIL;
-  
+
   }
   mysql_close(mysql);
   return OK;
@@ -1965,7 +1969,7 @@ static int test_conc490(MYSQL *my __attribute__((unused)))
 static int test_conc544(MYSQL *mysql)
 {
   int rc;
-  MYSQL *my= mysql_init(NULL);
+  MYSQL *my;
   char query[1024];
 
   SKIP_SKYSQL;
@@ -1984,6 +1988,8 @@ static int test_conc544(MYSQL *mysql)
     return SKIP;
   }
 
+  my= mysql_init(NULL);
+
   rc= mysql_optionsv(my, MARIADB_OPT_RESTRICTED_AUTH, "client_ed25519");
   check_mysql_rc(rc, mysql);
 
@@ -2036,8 +2042,8 @@ static int test_conn_str(MYSQL *my __attribute__((unused)))
   int rc=OK;
 
   snprintf(conn_str, sizeof(conn_str)-1, "host=%s;user=%s;password={%s};port=%d;socket=%s",
-                hostname ? hostname : "localhost", username ? username : "", 
-                password ? password : "", 
+                hostname ? hostname : "localhost", username ? username : "",
+                password ? password : "",
                 port, socketname ? socketname : "");
 
   /* SkySQL requires secure connection */
@@ -2066,7 +2072,7 @@ static int test_conn_str_1(MYSQL *my __attribute__((unused)))
   FILE *fp;
   int rc;
   char conn_str[1024];
-  
+
   SKIP_MAXSCALE;
 
   mysql= mysql_init(NULL);
@@ -2075,7 +2081,7 @@ static int test_conn_str_1(MYSQL *my __attribute__((unused)))
     return FAIL;
 
   sprintf(conn_str, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1;socket=%s",
-                hostname ? hostname : "localhost", username ? username : "", 
+                hostname ? hostname : "localhost", username ? username : "",
                 password ? password : "", ssl_port, socketname ? socketname : "");
 
   fprintf(fp, "[client]\n");
@@ -2141,7 +2147,7 @@ static int test_conc365(MYSQL *my __attribute__((unused)))
 
   if (rc)
     return rc;
-  
+
   mysql= mysql_init(NULL);
   mysql_options(mysql, MARIADB_OPT_HOST, tmp);
   if (!my_test_connect(mysql, NULL, username,
@@ -2569,9 +2575,9 @@ struct my_tests_st my_tests[] = {
   {"test_compress", test_compress, TEST_CONNECTION_NONE, 0, NULL,  NULL},
   {"test_reconnect", test_reconnect, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
   {"test_conc21", test_conc21, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
-  {"test_conc26", test_conc26, TEST_CONNECTION_NONE, 0, NULL, NULL}, 
+  {"test_conc26", test_conc26, TEST_CONNECTION_NONE, 0, NULL, NULL},
   {"test_connection_timeout", test_connection_timeout, TEST_CONNECTION_NONE, 0, NULL, NULL},
-  {"test_connection_timeout2", test_connection_timeout2, TEST_CONNECTION_NONE, 0, NULL, NULL}, 
+  {"test_connection_timeout2", test_connection_timeout2, TEST_CONNECTION_NONE, 0, NULL, NULL},
   {"test_connection_timeout3", test_connection_timeout3, TEST_CONNECTION_NONE, 0, NULL, NULL},
   {NULL, NULL, 0, 0, NULL, NULL}
 };