hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2674 Prevent read of unitialized variable

Browse Source
This commit is contained in:
Johan Wikman
2019-09-16 09:32:47 +03:00
parent 01ab0c8736
commit 60c33b149c
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -1665,26 +1665,30 @@ int32_t qc_mysql_query_has_clause(GWBUF* buf, int32_t* has_clause)
if (lex) if (lex)
{ {
int cmd = lex->sql_command;
if (!lex->describe if (!lex->describe
&& !is_show_command(lex->sql_command) && !is_show_command(cmd)
&& (lex->sql_command != SQLCOM_ALTER_PROCEDURE) && (cmd != SQLCOM_ALTER_PROCEDURE)
&& (lex->sql_command != SQLCOM_ALTER_TABLE) && (cmd != SQLCOM_ALTER_TABLE)
&& (lex->sql_command != SQLCOM_CALL) && (cmd != SQLCOM_CALL)
&& (lex->sql_command != SQLCOM_CREATE_PROCEDURE) && (cmd != SQLCOM_CREATE_PROCEDURE)
&& (lex->sql_command != SQLCOM_CREATE_TABLE) && (cmd != SQLCOM_CREATE_TABLE)
&& (lex->sql_command != SQLCOM_DROP_FUNCTION) && (cmd != SQLCOM_DROP_FUNCTION)
&& (lex->sql_command != SQLCOM_DROP_PROCEDURE) && (cmd != SQLCOM_DROP_PROCEDURE)
&& (lex->sql_command != SQLCOM_DROP_TABLE) && (cmd != SQLCOM_DROP_TABLE)
&& (lex->sql_command != SQLCOM_DROP_VIEW) && (cmd != SQLCOM_DROP_VIEW)
&& (lex->sql_command != SQLCOM_FLUSH) && (cmd != SQLCOM_FLUSH)
&& (lex->sql_command != SQLCOM_ROLLBACK) && (cmd != SQLCOM_ROLLBACK)
) )
{ {
SELECT_LEX* current = lex->all_selects_list; SELECT_LEX* current = lex->all_selects_list;
while (current && !*has_clause) while (current && !*has_clause)
{ {
if (current->where || current->having || current->select_limit) if (current->where || current->having ||
((cmd == SQLCOM_SELECT || cmd == SQLCOM_DELETE || cmd == SQLCOM_UPDATE)
&& current->select_limit))
{ {
*has_clause = true; *has_clause = true;
} }