summaryrefslogtreecommitdiff
path: root/sql/sp.cc
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@sun.com>2008-07-14 15:41:30 -0600
committerMarc Alff <marc.alff@sun.com>2008-07-14 15:41:30 -0600
commite73e7bb9aec760edf7b142ac57696d44da149d86 (patch)
tree86658bba7f6c4fe4f438a97390da42762a277d3d /sql/sp.cc
parent0617cf0f78fd79e6cf109720f708b98b35e34ce3 (diff)
downloadmariadb-git-e73e7bb9aec760edf7b142ac57696d44da149d86.tar.gz
Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on
build) The crash was caused by freeing the internal parser stack during the parser execution. This occured only for complex stored procedures, after reallocating the parser stack using my_yyoverflow(), with the following C call stack: - MYSQLparse() - any rule calling sp_head::restore_lex() - lex_end() - x_free(lex->yacc_yyss), xfree(lex->yacc_yyvs) The root cause is the implementation of stored procedures, which breaks the assumption from 4.1 that there is only one LEX structure per parser call. The solution is to separate the LEX structure into: - attributes that represent a statement (the current LEX structure), - attributes that relate to the syntax parser itself (Yacc_state), so that parsing multiple statements in stored programs can create multiple LEX structures while not changing the unique Yacc_state. Now, Yacc_state and the existing Lex_input_stream are aggregated into Parser_state, a structure that represent the complete state of the (Lexical + Syntax) parser. mysql-test/r/parser_stack.result: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) mysql-test/t/parser_stack.test: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sp.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sp_head.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_class.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_class.h: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_lex.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_lex.h: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_parse.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_prepare.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_trigger.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_view.cc: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build) sql/sql_yacc.yy: Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on build)
Diffstat (limited to 'sql/sp.cc')
-rw-r--r--sql/sp.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index 2392cabb220..d2a12f2190f 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -443,11 +443,12 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
goto end;
{
- Lex_input_stream lip(thd, defstr.c_ptr(), defstr.length());
- thd->m_lip= &lip;
+ Parser_state parser_state(thd, defstr.c_ptr(), defstr.length());
+ thd->m_parser_state= &parser_state;
lex_start(thd);
thd->spcont= NULL;
ret= MYSQLparse(thd);
+ thd->m_parser_state= NULL;
if (ret == 0)
{