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

Fixed #4364 (Segfault in CheckStl::stlBoundries)

This commit is contained in:
Robert Reif 2012-11-20 06:12:14 +01:00 committed by Daniel Marjamäki
parent e0c10efdce
commit ffe657128f
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkstl.cpp
View File

@ -721,10 +721,7 @@ void CheckStl::stlBoundries()
if (tok->link()) if (tok->link())
tok = tok->link(); tok = tok->link();
else else
while (tok && tok->str() != ">") continue;
tok = tok->next();
if (!tok)
break;
if (Token::Match(tok, "> :: iterator|const_iterator %var% =|;")) { if (Token::Match(tok, "> :: iterator|const_iterator %var% =|;")) {
const unsigned int iteratorid(tok->tokAt(3)->varId()); const unsigned int iteratorid(tok->tokAt(3)->varId());

23
test/teststl.cpp
View File

@ -92,6 +92,7 @@ private:
TEST_CASE(stlBoundries1); TEST_CASE(stlBoundries1);
TEST_CASE(stlBoundries2); TEST_CASE(stlBoundries2);
TEST_CASE(stlBoundries3); TEST_CASE(stlBoundries3);
TEST_CASE(stlBoundries4); // #4364
// if (str.find("ab")) // if (str.find("ab"))
TEST_CASE(if_find); TEST_CASE(if_find);
@ -1255,6 +1256,28 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (error) Invalid iterator 'current' used.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (error) Invalid iterator 'current' used.\n", errout.str());
} }
void stlBoundries4() {
check("void f() {\n"
" std::forward_list<std::vector<std::vector<int>>>::iterator it;\n"
" for (it = ab.begin(); ab.end() > it; ++it) {}\n"
"}");
ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous iterator comparison using operator< on 'std::forward_list'.\n", errout.str());
// don't crash
check("void f() {\n"
" if (list < 0) ;\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void f() {\n"
" if (list < 0) {\n"
" std::forward_list<std::vector<std::vector<int>>>::iterator it;\n"
" for (it = ab.begin(); ab.end() > it; ++it) {}\n"
" }\n"
"}");
ASSERT_EQUALS("[test.cpp:4]: (error) Dangerous iterator comparison using operator< on 'std::forward_list'.\n", errout.str());
}
void if_find() { void if_find() {