Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/tokenlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// How many compileExpression recursions are allowed?
// For practical code this could be endless. But in some special torture test
// there needs to be a limit.
static const int AST_MAX_DEPTH = 50;
static const int AST_MAX_DEPTH = 100;


TokenList::TokenList(const Settings* settings) :
Expand Down Expand Up @@ -705,7 +705,9 @@ static void compileUnaryOp(Token *&tok, AST_state& state, void(*f)(Token *&tok,
if (f) {
tok = tok->next();
state.depth++;
if (tok && state.depth <= AST_MAX_DEPTH)
if (state.depth > AST_MAX_DEPTH)
throw InternalError(tok, "maximum AST depth exceeded", InternalError::AST);
if (tok)
f(tok, state);
state.depth--;
}
Expand Down Expand Up @@ -1313,7 +1315,7 @@ static void compileComma(Token *&tok, AST_state& state)
static void compileExpression(Token *&tok, AST_state& state)
{
if (state.depth > AST_MAX_DEPTH)
return; // ticket #5592
throw InternalError(tok, "maximum AST depth exceeded", InternalError::AST); // ticket #5592
if (tok)
compileComma(tok, state);
}
Expand Down