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

Fixed #7365 (False positive: Use of erased iterator)

This commit is contained in:
Daniel Marjamäki 2017-09-08 09:45:30 +02:00
parent 57004ed533
commit 97125acabd
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkstl.cpp
View File

@ -137,8 +137,11 @@ void CheckStl::iterators()
if (containerAssignScope && tok2 == containerAssignScope->classEnd)
container = nullptr; // We don't know which containers might be used with the iterator
if (tok2 == validatingToken)
if (tok2 == validatingToken) {
validIterator = true;
eraseToken = nullptr;
invalidationScope = nullptr;
}
// Is iterator compared against different container?
if (tok2->isComparisonOp() && container && tok2->astOperand1() && tok2->astOperand2()) {
@ -256,7 +259,7 @@ void CheckStl::iterators()
// bailout handling. Assume that the iterator becomes valid if we see return/break.
// TODO: better handling
else if (Token::Match(tok2, "return|break")) {
else if (tok2->scope() == invalidationScope && Token::Match(tok2, "return|break|continue")) {
validatingToken = Token::findsimplematch(tok2->next(), ";");
}

13
test/teststl.cpp
View File

@ -915,6 +915,19 @@ private:
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void f(std::map<uint32, uint32> my_map) {\n" // #7365
" std::map<uint32, uint32>::iterator itr = my_map.begin();\n"
" switch (itr->first) {\n"
" case 0:\n"
" my_map.erase(itr);\n"
" continue;\n"
" case 1:\n"
" itr->second = 1;\n"
" break;\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void eraseReturn1() {