diff options
| author | Ravinder Thakur <ravinder.thakur@oracle.com> | 2012-12-13 20:58:09 +0530 |
|---|---|---|
| committer | Ravinder Thakur <ravinder.thakur@oracle.com> | 2012-12-13 20:58:09 +0530 |
| commit | 5d4dfc1639420d675fd8aa252d86167028debcbb (patch) | |
| tree | f81464d5ff0181e73ed47972b92ea2590323f1c7 /sql/sys_vars.cc | |
| parent | b132676b8550ce440ef537586fe64fa2ae5da247 (diff) | |
| parent | 9258223200047222e52463b49f6f1c83ca042075 (diff) | |
| download | mariadb-git-5d4dfc1639420d675fd8aa252d86167028debcbb.tar.gz | |
Merging from 5.1 to 5.5 for bug#11761752
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 5a0d2709a52..9e79cdcb6f3 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2812,6 +2812,14 @@ static bool check_log_path(sys_var *self, THD *thd, set_var *var) if (!path_length) return true; + if (!is_filename_allowed(var->save_result.string_value.str, + var->save_result.string_value.length)) + { + my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), + self->name.str, var->save_result.string_value.str); + return true; + } + MY_STAT f_stat; if (my_stat(path, &f_stat, MYF(0))) |