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

Fixed #5803 (False positive: Same iterator is used with different containers - insert() from range of different container)

This commit is contained in:
Daniel Marjamäki 2016-08-04 09:35:16 +02:00
parent 55b3f0bf38
commit 2566fd09da
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/checkstl.cpp
View File

@ -165,6 +165,20 @@ void CheckStl::iterators()
if (itTok->previous()->str() == "*") if (itTok->previous()->str() == "*")
continue; continue;
// inserting iterator range..
if (tok2->strAt(2) == "insert") {
const Token *par2 = itTok->nextArgument();
while (par2 && par2->str() != ")") {
if (par2->varId() == container->declarationId())
break;
if (par2->str() == "(")
par2 = par2->link();
par2 = par2->next();
}
if (par2->varId() == container->declarationId())
continue;
}
// Show error message, mismatching iterator is used. // Show error message, mismatching iterator is used.
iteratorsError(tok2, container->name(), tok2->str()); iteratorsError(tok2, container->name(), tok2->str());
} }

8
test/teststl.cpp
View File

@ -201,6 +201,14 @@ private:
" l2.insert(it, 0);\n" " l2.insert(it, 0);\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:6]: (error) Same iterator is used with different containers 'l1' and 'l2'.\n", errout.str()); ASSERT_EQUALS("[test.cpp:6]: (error) Same iterator is used with different containers 'l1' and 'l2'.\n", errout.str());
check("void foo() {\n" // #5803
" list<int> l1;\n"
" list<int> l2;\n"
" list<int>::iterator it = l1.begin();\n"
" l2.insert(it, l1.end());\n"
"}");
ASSERT_EQUALS("", errout.str());
} }
void iterator4() { void iterator4() {