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

MDEV-21997 Server crashes in LEX::create_item_ident_sp upon use of unknown identifier

Browse Source 
If there is no current_select and variable is not found among SP variables it can be only an error.
This commit is contained in:
Oleksandr Byelkin
2020-07-21 10:31:10 +02:00
parent 1ca52b969a
commit ddb8309e8c
3 changed files with 128 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
mysql-test/main/parser.result
View File

@ -1838,4 +1838,59 @@ ERROR 42S02: Table 'test.t1' doesn't exist
SET STATEMENT max_statement_time=180 FOR BACKUP LOCK test.t1; SET STATEMENT max_statement_time=180 FOR BACKUP LOCK test.t1;
SET STATEMENT max_statement_time=180 FOR BACKUP UNLOCK; SET STATEMENT max_statement_time=180 FOR BACKUP UNLOCK;
set SQL_MODE=@save_sql_mode; set SQL_MODE=@save_sql_mode;
#
# MDEV-21997: Server crashes in LEX::create_item_ident_sp
# upon use of unknown identifier
#
/*! IF 1 IN ( SELECT 2 ) OR foo = 3 THEN */ SELECT 4;
ERROR 42000: Undeclared variable: foo
BEGIN NOT ATOMIC
IF (SELECT 2) OR foo = 3 THEN
SELECT 4;
END IF ;
END;
$$
ERROR 42000: Undeclared variable: foo
# ... but if declare it then it still work
BEGIN NOT ATOMIC
DECLARE foo int;
IF (SELECT 2) OR foo = 3 THEN
SELECT 4;
END IF ;
END;
$$
4
4
CASE (SELECT 2) OR foo
WHEN 1 THEN
SET @x=10;
$$
ERROR 42000: Undeclared variable: foo
/*! WHILE (SELECT 2) OR foo */
SET @x=10;
END WHILE;
$$
ERROR 42000: Undeclared variable: foo
REPEAT
SET @x=10;
UNTIL (SELECT 2) OR foo
END REPEAT;
$$
ERROR 42000: Undeclared variable: foo
FOR i IN 1..(SELECT 2) OR foo
DO
SET @x=10;
END FOR;
$$
ERROR 42000: Undeclared variable: foo
# ... but automatic FOR variable still work
FOR i IN 1..2
DO
SELECT i;
END FOR;
$$
i
1
i
2
# End of 10.4 tests # End of 10.4 tests

66
mysql-test/main/parser.test
View File

@ -1613,4 +1613,70 @@ SET STATEMENT max_statement_time=180 FOR BACKUP LOCK test.t1;
SET STATEMENT max_statement_time=180 FOR BACKUP UNLOCK; SET STATEMENT max_statement_time=180 FOR BACKUP UNLOCK;
set SQL_MODE=@save_sql_mode; set SQL_MODE=@save_sql_mode;
--echo #
--echo # MDEV-21997: Server crashes in LEX::create_item_ident_sp
--echo # upon use of unknown identifier
--echo #
--error ER_SP_UNDECLARED_VAR
/*! IF 1 IN ( SELECT 2 ) OR foo = 3 THEN */ SELECT 4;
DELIMITER $$;
--error ER_SP_UNDECLARED_VAR
BEGIN NOT ATOMIC
IF (SELECT 2) OR foo = 3 THEN
SELECT 4;
END IF ;
END;
$$
--echo # ... but if declare it then it still work
BEGIN NOT ATOMIC
DECLARE foo int;
IF (SELECT 2) OR foo = 3 THEN
SELECT 4;
END IF ;
END;
$$
--error ER_SP_UNDECLARED_VAR
CASE (SELECT 2) OR foo
WHEN 1 THEN
SET @x=10;
$$
--error ER_SP_UNDECLARED_VAR
/*! WHILE (SELECT 2) OR foo */
SET @x=10;
END WHILE;
$$
--error ER_SP_UNDECLARED_VAR
REPEAT
SET @x=10;
UNTIL (SELECT 2) OR foo
END REPEAT;
$$
--error ER_SP_UNDECLARED_VAR
FOR i IN 1..(SELECT 2) OR foo
DO
SET @x=10;
END FOR;
$$
--echo # ... but automatic FOR variable still work
FOR i IN 1..2
DO
SELECT i;
END FOR;
$$
DELIMITER ;$$
--echo # End of 10.4 tests --echo # End of 10.4 tests

7
sql/sql_lex.cc
View File

@ -7598,6 +7598,13 @@ Item *LEX::create_item_ident_sp(THD *thd, Lex_ident_sys_st *name,
return new (thd->mem_root) Item_func_sqlerrm(thd); return new (thd->mem_root) Item_func_sqlerrm(thd);
} }
if (!current_select)
{
// we are out of SELECT or FOR so it is syntax error
my_error(ER_SP_UNDECLARED_VAR, MYF(0), name->str);
return NULL;
}
if (current_select->parsing_place == FOR_LOOP_BOUND) if (current_select->parsing_place == FOR_LOOP_BOUND)
return create_item_for_loop_bound(thd, &null_clex_str, &null_clex_str, return create_item_for_loop_bound(thd, &null_clex_str, &null_clex_str,
name); name);