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

Fix #12170 FP knownPointerToBool with function pointer (#5646)

This commit is contained in:
chrchr-github 2023-11-12 10:20:18 +01:00 committed by GitHub
parent 212d2141d3
commit a6b7a8c1cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/astutils.cpp
View File

@ -1481,7 +1481,7 @@ bool isUsedAsBool(const Token* const tok, const Settings* settings)
return true; return true;
if (isForLoopCondition(tok)) if (isForLoopCondition(tok))
return true; return true;
if (!Token::Match(parent, "%cop%")) { if (!Token::Match(parent, "%cop%") && !(parent->str() == "(" && tok == parent->astOperand1())) {
if (parent->str() == "," && parent->isInitComma()) if (parent->str() == "," && parent->isInitComma())
return false; return false;
std::vector<ValueType> vtParents = getParentValueTypes(tok, settings); std::vector<ValueType> vtParents = getParentValueTypes(tok, settings);

6
test/testother.cpp
View File

@ -11640,6 +11640,12 @@ private:
" if (dynamic_cast<D*>(b)) {}\n" " if (dynamic_cast<D*>(b)) {}\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("bool (*ptr)();\n" // #12170
"void f() {\n"
" if (!ptr || !ptr()) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
} }
}; };