diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-06-17 19:25:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-06-17 19:25:55 +0400 |
| commit | 4085836acf1b70738efe6d33a51e8d2ab9deb63f (patch) | |
| tree | ce2141a5c05365e5fe6a1c6e029205a4c8d784ef /sql/item_timefunc.cc | |
| parent | fee78df3130f68c68df7c136593cf92bcb0dd208 (diff) | |
| download | mariadb-git-4085836acf1b70738efe6d33a51e8d2ab9deb63f.tar.gz | |
MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'))
modified:
mysql-test/r/func_time.result
mysql-test/t/func_time.test
sql/item_timefunc.cc
sql/mysql_priv.h
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index a3b7611ba69..f2e604da4f1 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -396,8 +396,8 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, l_time->minute > 59 || l_time->second > 59) goto err; - if ((fuzzy_date & TIME_NO_ZERO_DATE) && - (l_time->year == 0 || l_time->month == 0 || l_time->day == 0)) + int was_cut; + if (check_date(l_time, fuzzy_date | TIME_INVALID_DATES, &was_cut)) goto err; if (val != val_end) @@ -799,7 +799,6 @@ longlong Item_func_to_days::val_int_endpoint(bool left_endp, bool *incl_endp) res=(longlong) calc_daynr(ltime.year,ltime.month,ltime.day); /* Set to NULL if invalid date, but keep the value */ null_value= check_date(<ime, - (ltime.year || ltime.month || ltime.day), (TIME_NO_ZERO_IN_DATE | TIME_NO_ZERO_DATE), &dummy); if (null_value) @@ -1126,7 +1125,7 @@ bool Item_func_unix_timestamp::get_timestamp_value(my_time_t *seconds, } MYSQL_TIME ltime; - if (get_arg0_date(<ime, 0)) + if (get_arg0_date(<ime, TIME_NO_ZERO_IN_DATE)) return 1; uint error_code; @@ -2309,8 +2308,7 @@ bool Item_date_typecast::get_date(MYSQL_TIME *ltime, uint fuzzy_date) ltime->time_type= MYSQL_TIMESTAMP_DATE; int unused; - if (check_date(ltime, ltime->year || ltime->month || ltime->day, - fuzzy_date, &unused)) + if (check_date(ltime, fuzzy_date, &unused)) { Lazy_string_time str(ltime); make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, |