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

ValueFlow: Fix FP in for loops when 2nd expression is 0

This commit is contained in:
Daniel Marjamäki 2016-12-20 07:54:38 +01:00
parent f1ad7368f6
commit 807b653739
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/valueflow.cpp
View File

@ -2351,6 +2351,8 @@ static bool valueFlowForLoop2(const Token *tok,
if (error) if (error)
return false; return false;
execute(secondExpression, &programMemory, &result, &error); execute(secondExpression, &programMemory, &result, &error);
if (result == 0) // 2nd expression is false => no looping
return false;
if (error) { if (error) {
// If a variable is reassigned in second expression, return false // If a variable is reassigned in second expression, return false
std::stack<const Token *> tokens; std::stack<const Token *> tokens;

10
test/testvalueflow.cpp
View File

@ -1662,6 +1662,14 @@ private:
ASSERT_EQUALS(false, testValueOfX(code, 4U, 2)); ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
ASSERT_EQUALS(true, testValueOfX(code, 5U, 2)); ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
code = "enum AB {A,B};\n" // enum => handled by valueForLoop2
"void f() {\n"
" int x;\n"
" for (x = 1; x < B; ++x)\n"
" a[x] = 0;\n" // <- not 1
"}";
ASSERT_EQUALS(false, testValueOfX(code, 5U, 1));
code = "void f(int a) {\n" code = "void f(int a) {\n"
" for (int x = a; x < 10; x++)\n" " for (int x = a; x < 10; x++)\n"
" a[x] = 0;\n" " a[x] = 0;\n"
@ -1733,7 +1741,7 @@ private:
" for (int x = 0; x < 10 && y = do_something();)\n" " for (int x = 0; x < 10 && y = do_something();)\n"
" x;\n" " x;\n"
"}"; "}";
ASSERT_EQUALS(true, testValueOfX(code, 4U, 0)); TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 4U, 0));
code = "void f() {\n" code = "void f() {\n"
" int x,y;\n" " int x,y;\n"