diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-15 14:57:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-01-15 14:57:50 +0100 |
| commit | 90f2ec5122789e30874947e43729d3b602201f6b (patch) | |
| tree | 895a241cf73597c15251f461524cf1081a462c17 /sql/sql_plugin.cc | |
| parent | b4daf8efac1342c461f28cdf59e75ff397a562f4 (diff) | |
| download | mariadb-git-90f2ec5122789e30874947e43729d3b602201f6b.tar.gz | |
bugfix: incorrect cast causing random memory write
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).
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index f386e864c3f..46849e266b5 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -3757,7 +3757,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp, options->name= optname; options->comment= opt->comment; - options->app_type= opt; + options->app_type= (opt->flags & PLUGIN_VAR_NOSYSVAR) ? NULL : opt; options->id= 0; 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); if (!(o->flags & PLUGIN_VAR_NOCMDOPT)) { + // update app_type, used for I_S.SYSTEM_VARIABLES for (my_option *mo=opts; mo->name; mo++) if (mo->app_type == o) mo->app_type= v; |