From 7fd957411712d2f24f978220615a001cf128410b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 24 Oct 2001 21:38:48 +0200 Subject: [PATCH] bug in libmysql.c:mysql_reconnect() fixed libmysql/libmysql.c: bug fixed (if mysql_real_connect() failed there were two pointers to malloc'ed strings, with memory corruption on free(), of course) --- libmysql/libmysql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index be0c01df000..4a5e534389e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1572,13 +1572,13 @@ static my_bool mysql_reconnect(MYSQL *mysql) } mysql_init(&tmp_mysql); tmp_mysql.options=mysql->options; + bzero((char*) &mysql->options,sizeof(mysql->options)); if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd, mysql->db, mysql->port, mysql->unix_socket, mysql->client_flag)) DBUG_RETURN(1); tmp_mysql.free_me=mysql->free_me; mysql->free_me=0; - bzero((char*) &mysql->options,sizeof(mysql->options)); mysql_close(mysql); *mysql=tmp_mysql; net_clear(&mysql->net);