feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CPlusPlus: Add missing error check to parseExpressionStatement()

Browse Source 
Fixes: QTCREATORBUG-32043
Change-Id: Ic4f1716339d1277d0a2d5a237fd6ae0389ed2485
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-11-25 13:25:47 +01:00
parent 95f384d62c
commit d1a662dbea
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -487,15 +487,17 @@ int Parser::find(int token, int stopAt)
return 0; return 0;
} }
void Parser::match(int kind, int *token) bool Parser::match(int kind, int *token)
{ {
if (LA() == kind) if (LA() == kind) {
*token = consumeToken(); *token = consumeToken();
else { return true;
*token = 0;
error(_tokenIndex, "expected token `%s' got `%s'",
Token::name(kind), tok().spell());
} }
*token = 0;
error(_tokenIndex, "expected token `%s' got `%s'",
Token::name(kind), tok().spell());
return false;
} }
bool Parser::parseClassOrNamespaceName(NameAST *&node) bool Parser::parseClassOrNamespaceName(NameAST *&node)
@@ -3503,7 +3505,8 @@ bool Parser::parseExpressionStatement(StatementAST *&node)
DEBUG_THIS_RULE(); DEBUG_THIS_RULE();
if (LA() == T_SEMICOLON) { if (LA() == T_SEMICOLON) {
ExpressionStatementAST *ast = new (_pool) ExpressionStatementAST; ExpressionStatementAST *ast = new (_pool) ExpressionStatementAST;
match(T_SEMICOLON, &ast->semicolon_token); if (!match(T_SEMICOLON, &ast->semicolon_token))
return false;
node = ast; node = ast;
return true; return true;
} }
@@ -3524,9 +3527,10 @@ bool Parser::parseExpressionStatement(StatementAST *&node)
ExpressionStatementAST *ast = new (previousPool) ExpressionStatementAST; ExpressionStatementAST *ast = new (previousPool) ExpressionStatementAST;
if (expression) if (expression)
ast->expression = expression->clone(previousPool); ast->expression = expression->clone(previousPool);
match(T_SEMICOLON, &ast->semicolon_token); if (match(T_SEMICOLON, &ast->semicolon_token)) {
node = ast; node = ast;
parsed = true; parsed = true;
}
} }
_inExpressionStatement = wasInExpressionStatement; _inExpressionStatement = wasInExpressionStatement;

2
src/libs/3rdparty/cplusplus/Parser.h vendored
View File

@@ -273,7 +273,7 @@ public:
const Identifier *className(ClassSpecifierAST *ast) const; const Identifier *className(ClassSpecifierAST *ast) const;
const Identifier *identifier(NameAST *name) const; const Identifier *identifier(NameAST *name) const;
void match(int kind, int *token); bool match(int kind, int *token);
bool maybeAmbiguousStatement(DeclarationStatementAST *ast, StatementAST *&node); bool maybeAmbiguousStatement(DeclarationStatementAST *ast, StatementAST *&node);
bool maybeForwardOrClassDeclaration(SpecifierListAST *decl_specifier_seq) const; bool maybeForwardOrClassDeclaration(SpecifierListAST *decl_specifier_seq) const;