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

Fix #9938 (false positive: StlMissingComparison) (#2989)

This commit is contained in:
abhijit-sawant 2021-01-04 04:07:07 -05:00 committed by GitHub
parent da198e0726
commit a4a225203c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/checkstl.cpp
View File

@ -1637,23 +1637,41 @@ void CheckStl::missingComparison()
} }
const Token *incrementToken = nullptr; const Token *incrementToken = nullptr;
bool bComparedInAdvance = false;
// Parse loop.. // Parse loop..
for (const Token *tok3 = scope.bodyStart; tok3 != scope.bodyEnd; tok3 = tok3->next()) { for (const Token *tok3 = scope.bodyStart; tok3 != scope.bodyEnd; tok3 = tok3->next())
if (Token::Match(tok3, "%varid% ++", iteratorId)) {
incrementToken = tok3; if (tok3->varId() == iteratorId)
else if (Token::Match(tok3->previous(), "++ %varid% !!.", iteratorId)) {
incrementToken = tok3; if (Token::Match(tok3, "%varid% = %name% . insert ( ++| %varid% ++| ,", iteratorId))
else if (Token::Match(tok3, "%varid% !=|==", iteratorId)) {
incrementToken = nullptr; // skip insertion..
tok3 = tok3->linkAt(6);
if (!tok3)
break;
}
else if (Token::simpleMatch(tok3->astParent(), "++"))
{
if (!bComparedInAdvance)
incrementToken = tok3;
else
bComparedInAdvance = false;
}
else if (Token::simpleMatch(tok3->astParent(), "+"))
{
if (Token::simpleMatch(tok3->astSibling(), "1"))
{
const Token* tokenGrandParent = tok3->astParent()->astParent();
if (Token::Match(tokenGrandParent, "==|!="))
bComparedInAdvance = true;
}
}
else if (Token::Match(tok3->astParent(), "==|!="))
incrementToken = nullptr;
}
else if (tok3->str() == "break" || tok3->str() == "return") else if (tok3->str() == "break" || tok3->str() == "return")
incrementToken = nullptr; incrementToken = nullptr;
else if (Token::Match(tok3, "%varid% = %name% . insert ( ++| %varid% ++| ,", iteratorId)) {
// skip insertion..
tok3 = tok3->linkAt(6);
if (!tok3)
break;
}
} }
if (incrementToken) if (incrementToken)
missingComparisonError(incrementToken, tok2->tokAt(16)); missingComparisonError(incrementToken, tok2->tokAt(16));

8
test/teststl.cpp
View File

@ -2986,6 +2986,14 @@ private:
" }\n" " }\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f(const std::vector<std::string> &v) {\n"
" for(std::vector<std::string>::const_iterator it = v.begin(); it != v.end(); ++it) {\n"
" if(it+1 != v.end())\n"
" ++it;\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
} }
void missingInnerComparison2() { void missingInnerComparison2() {