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

Fix issue 8839: FP knownConditionTrueFalse - condition inside a while-clause (#1469)

This commit is contained in:
Paul Fultz II 2018-11-08 23:09:51 -06:00 committed by Daniel Marjamäki
parent 17a8a4898d
commit 36e663e250
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/valueflow.cpp
View File

@ -1145,6 +1145,7 @@ static void valueFlowTerminatingCondition(TokenList *tokenlist, SymbolDatabase*
const Scope * condScope = nullptr; const Scope * condScope = nullptr;
for(const Scope * parent = condTok->scope();parent;parent = parent->nestedIn) { for(const Scope * parent = condTok->scope();parent;parent = parent->nestedIn) {
if (parent->type == Scope::eIf || if (parent->type == Scope::eIf ||
parent->type == Scope::eWhile ||
parent->type == Scope::eSwitch) { parent->type == Scope::eSwitch) {
condScope = parent; condScope = parent;
break; break;

10
test/testcondition.cpp
View File

@ -2673,6 +2673,16 @@ private:
" return std::time(0) > maxtime;\n" " return std::time(0) > maxtime;\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void foo(double param) {\n"
" while(bar()) {\n"
" if (param<0.)\n"
" return;\n"
" }\n"
" if (param<0.)\n"
" return;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
} }
void multiConditionAlwaysTrue() { void multiConditionAlwaysTrue() {