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

Fix #11404 FP knownConditionTrueFalse with iterator (#4619) 

* Fix wrong value set in valueFlowSameExpressions()

* Fix  #11404 FP knownConditionTrueFalse with iterator
This commit is contained in:
chrchr-github 2022-12-08 10:40:55 +01:00 committed by GitHub
parent 663a8411dd
commit 04b7c0c200
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/astutils.cpp
View File

@ -2735,8 +2735,13 @@ bool isExpressionChanged(const Token* expr, const Token* start, const Token* end
if (tok->exprId() > 0) {
for (const Token* tok2 = start; tok2 != end; tok2 = tok2->next()) {
if (isExpressionChangedAt(
tok, tok2, tok->valueType() ? tok->valueType()->pointer : 0, global, settings, cpp, depth))
int indirect = 0;
if (const ValueType* vt = tok->valueType()) {
indirect = vt->pointer;
if (vt->type == ValueType::ITERATOR)
++indirect;
}
if (isExpressionChangedAt(tok, tok2, indirect, global, settings, cpp, depth))
return true;
}
}

7
lib/valueflow.cpp
View File

@ -2440,8 +2440,11 @@ struct ValueFlowAnalyzer : Analyzer {
// TODO: Check if modified in the lambda function
return Action::Invalid;
int indirect = 0;
if (tok->valueType())
indirect = tok->valueType()->pointer;
if (const ValueType* vt = tok->valueType()) {
indirect = vt->pointer;
if (vt->type == ValueType::ITERATOR)
++indirect;
}
if (isVariableChanged(tok, indirect, getSettings(), isCPP()))
return Action::Invalid;
return Action::None;

12
test/testcondition.cpp
View File

@ -4628,6 +4628,18 @@ private:
" if (!std::isalnum(c)) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("struct S {\n" // #11404
" int f() const;\n"
" void g();\n"
"};\n"
"void h(std::vector<S*>::iterator it) {\n"
" auto i = (*it)->f();\n"
" (*it)->g();\n"
" auto j = (*it)->f();\n"
" if (i == j) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void alwaysTrueInfer() {