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

Fixed a false positive in #4109 (if (c == 1) c == 0; Isn't picked up)

This commit is contained in:
Zachary Blair 2013-01-18 16:34:15 -08:00
parent 7c615f0f12
commit 8647e4c0d0
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/checkother.cpp
View File

@ -1117,6 +1117,8 @@ void CheckOther::checkSuspiciousEqualityComparison()
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) { for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) {
if (Token::simpleMatch(tok, "for (")) { if (Token::simpleMatch(tok, "for (")) {
const Token* const openParen = tok->next();
const Token* const closeParen = tok->linkAt(1);
// Search for any suspicious equality comparison in the initialization // Search for any suspicious equality comparison in the initialization
// or increment-decrement parts of the for() loop. // or increment-decrement parts of the for() loop.
@ -1124,8 +1126,8 @@ void CheckOther::checkSuspiciousEqualityComparison()
// for (i == 2; i < 10; i++) // for (i == 2; i < 10; i++)
// or // or
// for (i = 0; i < 10; i == a) // for (i = 0; i < 10; i == a)
const Token* tok2 = Token::findmatch(tok->next(), "[;(] %var% == %any% [;)]", tok->linkAt(1)); const Token* tok2 = Token::findmatch(openParen, "[;(] %var% == %any% [;)]", closeParen);
if (tok2 && (tok2->str() == "(" || tok2->strAt(4) == ")")) { if (tok2 && (tok2 == openParen || tok2->tokAt(4) == closeParen)) {
suspiciousEqualityComparisonError(tok2->tokAt(2)); suspiciousEqualityComparisonError(tok2->tokAt(2));
} }
@ -1134,14 +1136,14 @@ void CheckOther::checkSuspiciousEqualityComparison()
// in the initialization or increment-decrement parts of the for() loop. // in the initialization or increment-decrement parts of the for() loop.
// For example: // For example:
// for (!i; i < 10; i++) // for (!i; i < 10; i++)
const Token* tok3 = Token::findmatch(tok->next(), "[;(] ! %var% [;)]", tok->linkAt(1)); const Token* tok3 = Token::findmatch(openParen, "[;(] ! %var% [;)]", closeParen);
if (tok3 && (tok3->str() == "(" || tok3->strAt(3) == ")")) { if (tok3 && (tok3 == openParen || tok3->tokAt(3) == closeParen)) {
suspiciousEqualityComparisonError(tok3->tokAt(2)); suspiciousEqualityComparisonError(tok3->tokAt(2));
} }
// Skip over for() loop conditions because "for (;running==1;)" // Skip over for() loop conditions because "for (;running==1;)"
// is a bit strange, but not necessarily incorrect. // is a bit strange, but not necessarily incorrect.
tok = tok->linkAt(1); tok = closeParen;
} }
if (Token::Match(tok, "[;{}] *| %var% == %any% ;")) { if (Token::Match(tok, "[;{}] *| %var% == %any% ;")) {

21
test/testother.cpp
View File

@ -2864,6 +2864,27 @@ private:
" printf(\"%i\n\", ({x == 0; x > 0 ? 10 : 20}));\n" " printf(\"%i\n\", ({x == 0; x > 0 ? 10 : 20}));\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
check("void foo(int x) {\n"
" for (const Token* const end = tok->link(); tok != end; tok = (tok == end) ? end : tok->next()) {\n"
" x++;\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void foo(int x) {\n"
" for (int i = (x == 0) ? 0 : 5; i < 10; i ++) {\n"
" x++;\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void foo(int x) {\n"
" for (int i = 0; i < 10; i += (x == 5) ? 1 : 2) {\n"
" x++;\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
} }
void selfAssignment() { void selfAssignment() {