walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

getArguments: Avoid too deep recursion in array initialization

This commit is contained in:
Daniel Marjamäki 2019-03-24 11:51:28 +01:00
parent e0f1418228
commit 7995b2fb86
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/astutils.cpp
View File

@ -1021,13 +1021,14 @@ int numberOfArguments(const Token *start)
return arguments; return arguments;
} }
static void getArgumentsRecursive(const Token *tok, std::vector<const Token *> *arguments) static void getArgumentsRecursive(const Token *tok, std::vector<const Token *> *arguments, unsigned int depth)
{ {
if (!tok) ++depth;
if (!tok || depth >= 100)
return; return;
if (tok->str() == ",") { if (tok->str() == ",") {
getArgumentsRecursive(tok->astOperand1(), arguments); getArgumentsRecursive(tok->astOperand1(), arguments, depth);
getArgumentsRecursive(tok->astOperand2(), arguments); getArgumentsRecursive(tok->astOperand2(), arguments, depth);
} else { } else {
arguments->push_back(tok); arguments->push_back(tok);
} }
@ -1042,7 +1043,7 @@ std::vector<const Token *> getArguments(const Token *ftok)
const Token *startTok = tok->astOperand2(); const Token *startTok = tok->astOperand2();
if (!startTok && Token::simpleMatch(tok->astOperand1(), ",")) if (!startTok && Token::simpleMatch(tok->astOperand1(), ","))
startTok = tok->astOperand1(); startTok = tok->astOperand1();
getArgumentsRecursive(startTok, &arguments); getArgumentsRecursive(startTok, &arguments, 0);
return arguments; return arguments;
} }