database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-3984: Double free of Master_info * when CHANGE MASTER fails.

Browse Source 
When CHANGE MASTER fails, it may or may not have already added
the Master_info * to the index. Implement logic that properly
handles removal and freeing in both cases.
This commit is contained in:
unknown
2013-01-30 15:11:36 +01:00
parent 6f2680a73c
commit ea5632e9d7
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_parse.cc
View File

@ -2393,6 +2393,7 @@ case SQLCOM_PREPARE:
LEX_MASTER_INFO *lex_mi= &thd->lex->mi;
Master_info *mi;
bool new_master= 0;
bool master_info_added;
if (check_global_access(thd, SUPER_ACL))
goto error;
@ -2415,15 +2416,19 @@ case SQLCOM_PREPARE:
new_master= 1;
}
res= change_master(thd, mi);
res= change_master(thd, mi, &master_info_added);
if (res && new_master)
{
/*
The new master was added by change_master(). Remove it as it didn't
work.
If the new master was added by change_master(), remove it as it didn't
work (this will free mi as well).
If new master was not added, we still need to free mi.
*/
master_info_index->remove_master_info(&lex_mi->connection_name);
delete mi;
if (master_info_added)
master_info_index->remove_master_info(&lex_mi->connection_name);
else
delete mi;
}
mysql_mutex_unlock(&LOCK_active_mi);