1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client.c: set connect attributes as late as possible

Browse Source 
just before they're sent to the client. Because mysql->host
value is known only after the connection is established,
and it's needed for the "_sever_host" attribute.

This fixes ASAN use-after-free warning in rpl tests

followup for ee8dfc688e8
This commit is contained in:
Sergei Golubchik 2018-06-02 22:27:59 +02:00
parent 748ef3ec91
commit eb76698300
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql-common/client.c
View File

@ -3123,9 +3123,6 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
DBUG_RETURN(0);
}
if (set_connect_attributes(mysql, buff, sizeof(buff)))
DBUG_RETURN(0);
mysql->methods= &client_methods;
mysql->client_flag=0; /* For handshake */
@ -3579,6 +3576,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
mysql->client_flag= client_flag;
set_connect_attributes(mysql, buff, sizeof(buff));
/*
Part 2: invoke the plugin to send the authentication data to the server
*/