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

Fix 11384: FP knownConditionTrueFalse when variable is modified in return statement (#4625) 

* Fix 11384: FP knownConditionTrueFalse when variable is modified in return statement

* Format
This commit is contained in:
Paul Fultz II 2022-12-09 00:15:15 -06:00 committed by GitHub
parent c779cefa61
commit c150317f02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/valueflow.cpp
View File

@ -6070,7 +6070,7 @@ struct ConditionHandler {
});
for (Token* start:nextExprs) {
Analyzer::Result r = forward(start, cond.vartok, values, tokenlist);
if (r.terminate != Analyzer::Terminate::None)
if (r.terminate != Analyzer::Terminate::None || r.action.isModified())
return;
}
}

7
test/testcondition.cpp
View File

@ -4640,6 +4640,13 @@ private:
" if (i == j) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
// #11384
check("bool f(const int* it, const int* end) {\n"
" return (it != end) && *it++ &&\n"
" (it != end) && *it;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void alwaysTrueInfer() {