noisymime
/
cppcheck
mirror of https://github.com/noisymime/cppcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #3410 (Comparing bool against bool produces false positive)

This commit is contained in:
Daniel Marjamäki 2011-12-20 06:38:05 +01:00
parent 6dc2a6e7ab
commit f8181df340
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkother.cpp
View File

@ -1530,7 +1530,7 @@ void CheckOther::checkComparisonOfBoolWithInt()
if (iVar != boolvars.end() && !iVar->second) { // Variable has to be of non-boolean standard type if (iVar != boolvars.end() && !iVar->second) { // Variable has to be of non-boolean standard type
comparisonOfBoolWithIntError(varTok, constTok->str()); comparisonOfBoolWithIntError(varTok, constTok->str());
} }
} else if (Token::Match(tok, "%var% >|>=|==|!=|<=|< %var%")) { // Comparing two variables, one of them boolean, one of them integer } else if (Token::Match(tok, "%var% >|>=|==|!=|<=|< %var%") && !Token::Match(tok->tokAt(3), ".|::|(")) { // Comparing two variables, one of them boolean, one of them integer
const Token *var1Tok = tok->tokAt(2); const Token *var1Tok = tok->tokAt(2);
const Token *var2Tok = tok; const Token *var2Tok = tok;
std::map<unsigned int, bool>::const_iterator iVar1 = boolvars.find(var1Tok->varId()); std::map<unsigned int, bool>::const_iterator iVar1 = boolvars.find(var1Tok->varId());

9
test/testother.cpp
View File

@ -138,6 +138,7 @@ private:
TEST_CASE(comparisonOfBoolWithInt3); TEST_CASE(comparisonOfBoolWithInt3);
TEST_CASE(comparisonOfBoolWithInt4); TEST_CASE(comparisonOfBoolWithInt4);
TEST_CASE(comparisonOfBoolWithInt5); TEST_CASE(comparisonOfBoolWithInt5);
TEST_CASE(comparisonOfBoolWithInt6);
TEST_CASE(duplicateIf); TEST_CASE(duplicateIf);
TEST_CASE(duplicateBranch); TEST_CASE(duplicateBranch);
@ -3711,6 +3712,14 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void comparisonOfBoolWithInt6() {
check("void SetVisible(int index, bool visible) {\n"
" bool (SciTEBase::*ischarforsel)(char ch);\n"
" if (visible != GetVisible(index)) { }\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void duplicateIf() { void duplicateIf() {
check("void f(int a, int &b) {\n" check("void f(int a, int &b) {\n"
" if (a) { b = 1; }\n" " if (a) { b = 1; }\n"