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

Fix issue 9973: False positive: mismatching iterator container, reference (#2893)

This commit is contained in:
Paul Fultz II 2020-11-10 02:38:05 -06:00 committed by GitHub
parent bd5fc4b579
commit ae6f611df0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkstl.cpp
View File

@ -796,10 +796,16 @@ void CheckStl::mismatchingContainerIterator()
continue; continue;
if (val.lifetimeKind != ValueFlow::Value::LifetimeKind::Iterator) if (val.lifetimeKind != ValueFlow::Value::LifetimeKind::Iterator)
continue; continue;
if (isSameExpression(true, false, tok, val.tokvalue, mSettings->library, false, false)) for (const LifetimeToken& lt:getLifetimeTokens(tok)) {
if (lt.inconclusive)
continue;
const Token* contTok = lt.token;
if (isSameExpression(true, false, contTok, val.tokvalue, mSettings->library, false, false))
continue; continue;
mismatchingContainerIteratorError(tok, iterTok); mismatchingContainerIteratorError(tok, iterTok);
} }
}
} }
} }

14
test/teststl.cpp
View File

@ -1351,6 +1351,20 @@ private:
" return a;\n" " return a;\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:2]: (error) Iterator 'b.begin()' from different container 'a' are used together.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (error) Iterator 'b.begin()' from different container 'a' are used together.\n", errout.str());
// #9973
check("void f() {\n"
" std::list<int> l1;\n"
" std::list<int> l2;\n"
" std::list<int>& l = l2;\n"
" for (auto it = l.begin(); it != l.end(); ++it) {\n"
" if (*it == 1) {\n"
" l.erase(it);\n"
" break;\n"
" }\n"
" }\n"
"}\n");
ASSERT_EQUALS("", errout.str());
} }
// Dereferencing invalid pointer // Dereferencing invalid pointer