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

Correct false positives compareBoolExpressionWithInt (0U)

This commit is contained in:
Alexander Mai 2016-02-19 21:38:54 +01:00
parent 0fc59d0228
commit 5c2960713f
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkbool.cpp
View File

@ -353,11 +353,12 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
continue; continue;
if (numTok->isNumber()) { if (numTok->isNumber()) {
if (numTok->str() == "0" && const MathLib::bigint num = MathLib::toLongNumber(numTok->str());
if (num==0 &&
(numInRhs ? Token::Match(tok, ">|==|!=") (numInRhs ? Token::Match(tok, ">|==|!=")
: Token::Match(tok, "<|==|!="))) : Token::Match(tok, "<|==|!=")))
continue; continue;
if (numTok->str() == "1" && if (num==1 &&
(numInRhs ? Token::Match(tok, "<|==|!=") (numInRhs ? Token::Match(tok, "<|==|!=")
: Token::Match(tok, ">|==|!="))) : Token::Match(tok, ">|==|!=")))
continue; continue;

13
test/testbool.cpp
View File

@ -538,6 +538,19 @@ private:
" return a > b or c < d;\n" " return a > b or c < d;\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("int f() {\n"
" return (a < b) != 0U;\n"
"}");
ASSERT_EQUALS("", errout.str());
check("int f() {\n"
" return (a < b) != 0x0;\n"
"}");
ASSERT_EQUALS("", errout.str());
check("int f() {\n"
" return (a < b) != 42U;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
} }
void checkComparisonOfFuncReturningBool1() { void checkComparisonOfFuncReturningBool1() {