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

Verification; Determine argument number properly

This commit is contained in:
Daniel Marjamäki 2019-12-26 18:32:59 +01:00
parent 31bddb6ae0
commit ec4668353d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/exprengine.cpp
View File

@ -1653,16 +1653,24 @@ void ExprEngine::runChecks(ErrorLogger *errorLogger, const Tokenizer *tokenizer,
std::function<void(const Token *, const ExprEngine::Value &, ExprEngine::DataBase *)> checkFunctionCall = [=](const Token *tok, const ExprEngine::Value &value, ExprEngine::DataBase *dataBase) { std::function<void(const Token *, const ExprEngine::Value &, ExprEngine::DataBase *)> checkFunctionCall = [=](const Token *tok, const ExprEngine::Value &value, ExprEngine::DataBase *dataBase) {
if (!Token::Match(tok->astParent(), "[(,]")) if (!Token::Match(tok->astParent(), "[(,]"))
return; return;
int num = (tok == tok->astParent()->astOperand2()) ? 1 : 0;
const Token *parent = tok->astParent(); const Token *parent = tok->astParent();
while (Token::simpleMatch(parent, ",")) { while (Token::simpleMatch(parent, ","))
parent = parent->astParent(); parent = parent->astParent();
++num; if (!parent || parent->str() != "(")
}
if (!parent || parent->str() != "(" || num == 0)
return; return;
if (parent->astOperand1() && parent->astOperand1()->function()) { int num = 0;
for (const Token *argTok: getArguments(parent->astOperand1())) {
--num;
if (argTok == tok) {
num = -num;
break;
}
}
if (num <= 0)
return;
if (parent->astOperand1()->function()) {
const Variable *arg = parent->astOperand1()->function()->getArgumentVar(num - 1); const Variable *arg = parent->astOperand1()->function()->getArgumentVar(num - 1);
if (arg->nameToken()) { if (arg->nameToken()) {
std::string bad; std::string bad;
@ -1690,6 +1698,7 @@ void ExprEngine::runChecks(ErrorLogger *errorLogger, const Tokenizer *tokenizer,
"verificationInvalidArgValue", "verificationInvalidArgValue",
"There is function call, cannot determine that " + std::to_string(num) + getOrdinalText(num) + " argument value meets the attribute " + bad, CWE(0), false); "There is function call, cannot determine that " + std::to_string(num) + getOrdinalText(num) + " argument value meets the attribute " + bad, CWE(0), false);
errorLogger->reportErr(errmsg); errorLogger->reportErr(errmsg);
return;
} }
} }
} }