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

ValueFlow: Better handling of calculated function arguments in valueFlowSubFunction

This commit is contained in:
Daniel Marjamäki 2014-08-04 12:31:04 +02:00
parent 344016f7ab
commit d35ce5f0db
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/valueflow.cpp
View File

@ -1327,11 +1327,9 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
continue; continue;
// passing value(s) to function // passing value(s) to function
if (Token::Match(tok, "[(,] %var% [,)]") && !tok->next()->values.empty()) if (Token::Match(tok, "[(,] %var%|%num%|%str% [,)]") && !tok->next()->values.empty())
argvalues = tok->next()->values; argvalues = tok->next()->values;
else if (Token::Match(tok, "[(,] %num%|%str% [,)]") && !tok->next()->values.empty()) { else {
argvalues = tok->next()->values;
} else {
// bool operator => values 1/0 are passed to function.. // bool operator => values 1/0 are passed to function..
const Token *op = tok->next(); const Token *op = tok->next();
while (op && op->astParent() && !Token::Match(op->astParent(), "[(,]")) while (op && op->astParent() && !Token::Match(op->astParent(), "[(,]"))
@ -1340,6 +1338,8 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
argvalues.clear(); argvalues.clear();
argvalues.push_back(ValueFlow::Value(0)); argvalues.push_back(ValueFlow::Value(0));
argvalues.push_back(ValueFlow::Value(1)); argvalues.push_back(ValueFlow::Value(1));
} else if (Token::Match(op, "%cop%") && !op->values.empty()) {
argvalues = op->values;
} else { } else {
// possible values are unknown.. // possible values are unknown..
continue; continue;

10
test/testvalueflow.cpp
View File

@ -1096,6 +1096,16 @@ private:
"}\n" "}\n"
"void f2() { f1(0.5); }"; "void f2() { f1(0.5); }";
ASSERT_EQUALS(false, testValueOfX(code, 2U, 0)); ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
code = "void dostuff(int x) {\n"
" return x/x;\n"
"}\n"
"\n"
"void test(int x) {\n"
" if(x==1) {}\n"
" dostuff(x+1);\n"
"}\n";
ASSERT_EQUALS(true, testValueOfX(code, 2U, 2));
} }
void valueFlowFunctionReturn() { void valueFlowFunctionReturn() {