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

Fixed #6138 (ValueFlow: entry can't be 0 in loop code 'while (entry = get()) entry->value;')

This commit is contained in:
Daniel Marjamäki 2014-10-11 17:48:51 +02:00
parent 70561682eb
commit 31d8cac8c9
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/valueflow.cpp
View File

@ -726,6 +726,13 @@ static bool valueFlowForward(Token * const startToken,
// conditional block of code that assigns variable.. // conditional block of code that assigns variable..
else if (Token::Match(tok2, "%var% (") && Token::simpleMatch(tok2->linkAt(1), ") {")) { else if (Token::Match(tok2, "%var% (") && Token::simpleMatch(tok2->linkAt(1), ") {")) {
// is variable changed in condition?
if (isVariableChanged(tok2->next(), tok2->next()->link(), varid)) {
if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "variable " + var->name() + " valueFlowForward, assignment in condition");
return false;
}
// Should scope be skipped because variable value is checked? // Should scope be skipped because variable value is checked?
std::list<ValueFlow::Value> truevalues; std::list<ValueFlow::Value> truevalues;
for (std::list<ValueFlow::Value>::iterator it = values.begin(); it != values.end(); ++it) { for (std::list<ValueFlow::Value>::iterator it = values.begin(); it != values.end(); ++it) {

10
test/testvalueflow.cpp
View File

@ -873,6 +873,14 @@ private:
ASSERT_EQUALS(false, testValueOfX(code, 8U, 34)); ASSERT_EQUALS(false, testValueOfX(code, 8U, 34));
// while/for // while/for
code = "void f() {\n" // #6138
" ENTRY *x = 0;\n"
" while (x = get()) {\n"
" set(x->value);\n" // <- x is not 0
" }\n"
"}\n";
ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
code = "void f(const int *buf) {\n" code = "void f(const int *buf) {\n"
" int x = 0;\n" " int x = 0;\n"
" for (int i = 0; i < 10; i++) {\n" " for (int i = 0; i < 10; i++) {\n"
@ -1049,7 +1057,7 @@ private:
" for (; x && \n" " for (; x && \n"
" x->str() != y; x = x->next()) {}\n" " x->str() != y; x = x->next()) {}\n"
"}"; "}";
ASSERT_EQUALS(true, testValueOfX(code, 3U, 0)); TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, 0));
ASSERT_EQUALS(false, testValueOfX(code, 4U, 0)); ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
code = "void f(const Token* x) {\n" code = "void f(const Token* x) {\n"