From eb76698300c8611eddc2756aa5dbc57cdae2e21d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 2 Jun 2018 22:27:59 +0200 Subject: client.c: set connect attributes as late as possible 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 --- sql-common/client.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sql-common/client.c') diff --git a/sql-common/client.c b/sql-common/client.c index 6a44a2db0aa..ad85738b0cb 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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 */ -- cgit v1.2.1