Commit f028989b authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

fixed double-free bug in COM_CHANGE_USER

parent ed62ee1c

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -793,6 +793,7 @@ bool do_command(THD *thd) 
    char *save_user=	    thd->user;

    char *save_priv_user=   thd->priv_user;

    char *save_db=	    thd->db;

    thd->user=0;



    if ((uint) ((uchar*) db - net->read_pos) > packet_length)

    {						// Check if protocol is ok
@@ -802,7 +803,6 @@ bool do_command(THD *thd) 
    if (check_user(thd, COM_CHANGE_USER, user, passwd, db, 0))

    {						// Restore old user

      x_free(thd->user);

      x_free(thd->db);

      thd->master_access=save_master_access;

      thd->db_access=save_db_access;

      thd->db=save_db;