Commit 5d45e0b6 authored by Erik Verbruggen's avatar Erik Verbruggen Committed by Nikolai Kosjar

C++: block recursion when parsing subsequent case statements.

A case or a default statement must be followed by another statement.
When a such a case (or default) statement is followed immediately by
another case (or default) statement, then this would create a linked
list, and the parser will recurse to parse such input.

In order to prevent the parser running out of stack space while
recursing, parse this corner case by blocking parsing a labeled
statement as the first statement after a labeled statement.

The advantage is that these statements do not form a linked list, so any
subsequent visitation of the AST won't run out of stack space either.

Change-Id: Id2111a49509132997f5fbe4bb12c92c729ec2522
Task-number: QTCREATORBUG-12673
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent f51553b2
......@@ -3031,7 +3031,7 @@ bool Parser::parseExpressionStatement(StatementAST *&node)
return parsed;
}
bool Parser::parseStatement(StatementAST *&node)
bool Parser::parseStatement(StatementAST *&node, bool blockLabeledStatement)
{
DEBUG_THIS_RULE();
switch (LA()) {
......@@ -3058,6 +3058,8 @@ bool Parser::parseStatement(StatementAST *&node)
case T_CASE:
case T_DEFAULT:
if (blockLabeledStatement)
return false;
return parseLabeledStatement(node);
case T_BREAK:
......@@ -3126,8 +3128,11 @@ bool Parser::parseStatement(StatementAST *&node)
}
default:
if (LA() == T_IDENTIFIER && LA(2) == T_COLON)
if (LA() == T_IDENTIFIER && LA(2) == T_COLON) {
if (blockLabeledStatement)
return false;
return parseLabeledStatement(node);
}
return parseExpressionOrDeclarationStatement(node);
} // switch
......@@ -3598,7 +3603,7 @@ bool Parser::parseLabeledStatement(StatementAST *&node)
LabeledStatementAST *ast = new (_pool) LabeledStatementAST;
ast->label_token = consumeToken();
ast->colon_token = consumeToken();
parseStatement(ast->statement);
parseStatement(ast->statement, /*blockLabeledStatement =*/ true);
node = ast;
return true;
}
......@@ -3608,7 +3613,7 @@ bool Parser::parseLabeledStatement(StatementAST *&node)
LabeledStatementAST *ast = new (_pool) LabeledStatementAST;
ast->label_token = consumeToken();
match(T_COLON, &ast->colon_token);
parseStatement(ast->statement);
parseStatement(ast->statement, /*blockLabeledStatement =*/ true);
node = ast;
return true;
}
......@@ -3618,7 +3623,7 @@ bool Parser::parseLabeledStatement(StatementAST *&node)
ast->case_token = consumeToken();
parseConstantExpression(ast->expression);
match(T_COLON, &ast->colon_token);
parseStatement(ast->statement);
parseStatement(ast->statement, /*blockLabeledStatement =*/ true);
node = ast;
return true;
}
......
......@@ -142,7 +142,7 @@ public:
bool parsePtrOperator(PtrOperatorListAST *&node);
bool parseRelationalExpression(ExpressionAST *&node);
bool parseShiftExpression(ExpressionAST *&node);
bool parseStatement(StatementAST *&node);
bool parseStatement(StatementAST *&node, bool blockLabeledStatement = false);
bool parseThisExpression(ExpressionAST *&node);
bool parseBoolLiteral(ExpressionAST *&node);
bool parseNumericLiteral(ExpressionAST *&node);
......
This diff is collapsed.
......@@ -133,6 +133,7 @@ void tst_c99::parse_data()
QTest::newRow("designatedInitializer.1") << "designatedInitializer.1.c" << "";
QTest::newRow("designatedInitializer.2") << "designatedInitializer.2.c" << "";
QTest::newRow("limits-caselabels (QTCREATORBUG-12673)") << "limits-caselabels.c" << "";
}
void tst_c99::parse()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment