diff options
| author | cmiller@zippy.(none) <> | 2006-07-11 13:06:29 -0400 |
|---|---|---|
| committer | cmiller@zippy.(none) <> | 2006-07-11 13:06:29 -0400 |
| commit | 22485908ce5eb1ab04869f3636bed0b980613015 (patch) | |
| tree | efc83f492c0f549dba2db98ebbc02e7da5e517a5 /sql/time.cc | |
| parent | da935665fe027937c6342581d5a672550b391dba (diff) | |
| download | mariadb-git-22485908ce5eb1ab04869f3636bed0b980613015.tar.gz | |
Bug#20729: Bad date_format() call makes mysql server crash
The problem is that the author used the wrong function to send a warning to the
user about truncation of data. push_warning() takes a constant string and
push_warning_printf() takes a format and variable arguments to fill it.
Since the string we were complaining about contains percent characters, the
printf() code interprets the "%Y" et c. that the user sends. That's wrong, and
often causes a crash, especially if the date mentions seconds, "%s".
A alternate fix would be to use push_warning_printf(..., "%s", warn_buff) .
Diffstat (limited to 'sql/time.cc')
| -rw-r--r-- | sql/time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/time.cc b/sql/time.cc index e76b169b336..ef832ac5a70 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -797,7 +797,7 @@ void make_truncated_value_warning(THD *thd, const char *str_val, } sprintf(warn_buff, ER(ER_TRUNCATED_WRONG_VALUE), type_str, str.ptr()); - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE, warn_buff); } |