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

ValueFlow: Change value to 'Possible' after conditional assignment in inner loop

This commit is contained in:
Daniel Marjamäki 2015-07-16 21:08:32 +02:00
parent 38214b6907
commit 09efe140fe
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/valueflow.cpp
View File

@ -1002,8 +1002,11 @@ static bool valueFlowForward(Token * const startToken,
for (it = values.begin(); it != values.end();) {
if (it->condition || it->conditional)
values.erase(it++);
else
else {
if (it->valueKind == ValueFlow::Value::Known)
it->valueKind = ValueFlow::Value::Possible;
++it;
}
}
}

18
test/testvalueflow.cpp
View File

@ -1548,6 +1548,24 @@ private:
ASSERT_EQUALS(9, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Possible, value.valueKind);
code = "void f() {\n"
" int x = 0;\n"
" for (int i = 0; i < 10; i++) {\n"
" if (cond) {\n"
" x = 1;\n"
" break;\n"
" }\n"
" }\n"
" if (!x) {}\n" // <- possible value
"}";
std::list<ValueFlow::Value> values = tokenValues(code, "!");
bool possible = false;
for (std::list<ValueFlow::Value>::const_iterator it = values.begin(); it != values.end(); ++it) {
if (it->valueKind == ValueFlow::Value::Possible)
possible = true;
}
ASSERT_EQUALS(true, possible);
// after condition
code = "int f(int x) {\n"
" if (x == 4) {}\n"