diff options
| author | unknown <monty@mysql.com> | 2004-02-20 00:26:05 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-20 00:26:05 +0200 |
| commit | 51a6b4f47ad03031105b0f8ac810d522a804695e (patch) | |
| tree | bfdcdd3080ed1dd1bb67455ac9ab2043d09050c0 /sql/set_var.cc | |
| parent | 403255b887483d73bbefa5506bcbb008136809c3 (diff) | |
| download | mariadb-git-51a6b4f47ad03031105b0f8ac810d522a804695e.tar.gz | |
Safety fixes (strnmov -> strmake)
sql/mysqld.cc:
Safety fix
sql/set_var.cc:
Safety fix
sql/sql_db.cc:
indentation cleanup
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 975d7da1753..f3728ce9e5d 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -860,8 +860,8 @@ static void sys_default_init_slave(THD* thd, enum_var_type type) static int sys_check_ftb_syntax(THD *thd, set_var *var) { if (thd->master_access & SUPER_ACL) - return ft_boolean_check_syntax_string(var->value->str_value.ptr()) ? - -1 : 0; + return ft_boolean_check_syntax_string(var->value->str_value.c_ptr()) ? + -1 : 0; else { my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER"); @@ -871,13 +871,15 @@ static int sys_check_ftb_syntax(THD *thd, set_var *var) static bool sys_update_ftb_syntax(THD *thd, set_var * var) { - strnmov(ft_boolean_syntax, var->value->str_value.ptr(), sizeof(ft_boolean_syntax)); + strmake(ft_boolean_syntax, var->value->str_value.c_ptr(), + sizeof(ft_boolean_syntax)-1); return 0; } static void sys_default_ftb_syntax(THD *thd, enum_var_type type) { - strnmov(ft_boolean_syntax, opt_ft_boolean_syntax, sizeof(ft_boolean_syntax)); + strmake(ft_boolean_syntax, opt_ft_boolean_syntax, + sizeof(ft_boolean_syntax)-1); } /* |