database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fix for bug #12841

Browse Source 
(Server crash on DO IFNULL(NULL,NULL)
(fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
 crash)
(new revampled fix with suggestions from Igor)


mysql-test/r/select.result:
  result of test for bug 12841
mysql-test/t/select.test:
  test for bug #12841
  (Server crash on DO IFNULL(NULL,NULL)
sql/item_func.cc:
  don't use the return value of ::str_op() without checking it
  whether checking it for NULL. (fixes bug #12841 as well as
  another not reported bug, but existing one - test case added).
  All other places where ::str_op() is used are safe.
This commit is contained in:
unknown
2005-08-29 15:45:03 +02:00
parent 901075ac22
commit c38e297b64
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/select.result
View File

@ -2875,6 +2875,16 @@ b a t1_val t2_val
1 1 1 1 1 1 1 1
1 2 2 1 1 2 2 1
drop table t1, t2, t3; drop table t1, t2, t3;
DO IFNULL(NULL, NULL);
SELECT CAST(IFNULL(NULL, NULL) AS DECIMAL);
CAST(IFNULL(NULL, NULL) AS DECIMAL)
NULL
SELECT ABS(IFNULL(NULL, NULL));
ABS(IFNULL(NULL, NULL))
NULL
SELECT IFNULL(NULL, NULL);
IFNULL(NULL, NULL)
NULL
create table t1 (a char(1)); create table t1 (a char(1));
create table t2 (a char(1)); create table t2 (a char(1));
insert into t1 values ('a'),('b'),('c'); insert into t1 values ('a'),('b'),('c');

9
mysql-test/t/select.test
View File

@ -2445,6 +2445,15 @@ select * from t1 natural join t3 natural join t2;
drop table t1, t2, t3; drop table t1, t2, t3;
#
# Bug #12841: Server crash on DO IFNULL(NULL,NULL)
#
# (testing returning of int, decimal, real, string)
DO IFNULL(NULL, NULL);
SELECT CAST(IFNULL(NULL, NULL) AS DECIMAL);
SELECT ABS(IFNULL(NULL, NULL));
SELECT IFNULL(NULL, NULL);
# #
# Bug #6495 Illogical requirement for column qualification in NATURAL join # Bug #6495 Illogical requirement for column qualification in NATURAL join
# #

13
sql/item_func.cc
View File

@ -734,11 +734,13 @@ longlong Item_func_numhybrid::val_int()
case STRING_RESULT: case STRING_RESULT:
{ {
int err_not_used; int err_not_used;
String *res= str_op(&str_value); String *res;
if (!(res= str_op(&str_value)))
return 0;
char *end= (char*) res->ptr() + res->length(); char *end= (char*) res->ptr() + res->length();
CHARSET_INFO *cs= str_value.charset(); CHARSET_INFO *cs= str_value.charset();
return (res ? (*(cs->cset->strtoll10))(cs, res->ptr(), &end, return (*(cs->cset->strtoll10))(cs, res->ptr(), &end, &err_not_used);
&err_not_used) : 0);
} }
default: default:
DBUG_ASSERT(0); DBUG_ASSERT(0);
@ -769,7 +771,10 @@ my_decimal *Item_func_numhybrid::val_decimal(my_decimal *decimal_value)
} }
case STRING_RESULT: case STRING_RESULT:
{ {
String *res= str_op(&str_value); String *res;
if (!(res= str_op(&str_value)))
return NULL;
str2my_decimal(E_DEC_FATAL_ERROR, (char*) res->ptr(), str2my_decimal(E_DEC_FATAL_ERROR, (char*) res->ptr(),
res->length(), res->charset(), decimal_value); res->length(), res->charset(), decimal_value);
break; break;