database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Bug#57512 str_to_date crash...

Browse Source 
str_to_date function should only try to generate a warning for
invalid input strings, not when input value is NULL. In latter
case, val_str() of input argument will return a nil pointer.
Trying to generate a warning using this pointer lead to a
segmentation fault. Solution: Only generate warning when pointer
to input string is non-nil.


mysql-test/r/func_time.result:
  Added test case for Bug#57512
mysql-test/t/func_time.test:
  Added test case for Bug#57512
sql/item_timefunc.cc:
  Skip generating warning when pointer to input string is nil
  since this implies that input argument was NULL.
This commit is contained in:
Oystein Grovlen
2010-10-20 15:17:29 +02:00
parent 6ce340789a
commit 7a8515cc20
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_timefunc.cc
View File

@@ -3465,7 +3465,7 @@ bool Item_func_str_to_date::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
return 0;
null_date:
if (fuzzy_date & TIME_NO_ZERO_DATE)
if (val && (fuzzy_date & TIME_NO_ZERO_DATE))
{
char buff[128];
strmake(buff, val->ptr(), min(val->length(), sizeof(buff)-1));