database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

bugfix: incorrect cast causing random memory write

Browse Source 
options->app_type was set to mysql_sysvar_t* pointer,
later changed to sys_var* pointer, and even later dereferenced as
sys_var*. But for PLUGIN_VAR_NOSYSVAR variables the pointer wasn't
changed to sys_var*, so mysql_sysvar_t* pointer was dereferenced
(and updated!) as if it was sys_var*.

This caused maria.maria-gis-recovery test failure on x86 (fulltest2).
This commit is contained in:
Sergei Golubchik
2015-01-15 14:57:50 +01:00
parent b4daf8efac
commit 90f2ec5122
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_plugin.cc
View File

@ -3757,7 +3757,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
options->name= optname; options->name= optname;
options->comment= opt->comment; options->comment= opt->comment;
options->app_type= opt; options->app_type= (opt->flags & PLUGIN_VAR_NOSYSVAR) ? NULL : opt;
options->id= 0; options->id= 0;
plugin_opt_set_limits(options, opt); plugin_opt_set_limits(options, opt);
@ -3913,6 +3913,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp,
v= new (mem_root) sys_var_pluginvar(&chain, varname, tmp, o); v= new (mem_root) sys_var_pluginvar(&chain, varname, tmp, o);
if (!(o->flags & PLUGIN_VAR_NOCMDOPT)) if (!(o->flags & PLUGIN_VAR_NOCMDOPT))
{ {
// update app_type, used for I_S.SYSTEM_VARIABLES
for (my_option *mo=opts; mo->name; mo++) for (my_option *mo=opts; mo->name; mo++)
if (mo->app_type == o) if (mo->app_type == o)
mo->app_type= v; mo->app_type= v;