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

Fixed #1930 (false negative: bad iterators checks fails to detect bugs with preincrement)

This commit is contained in:
Erik Lax 2010-08-13 20:54:31 +02:00 committed by Daniel Marjamäki
parent ab7bb876f9
commit 032d2678aa
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkstl.cpp
View File

@ -289,7 +289,7 @@ void CheckStl::eraseCheckLoop(const Token *it)
tok2 = 0; tok2 = 0;
break; break;
} }
else if (Token::simpleMatch(tok, ("erase ( " + it->str() + " )").c_str())) else if (Token::Match(tok, ("erase ( ++|--| " + it->str() + " )").c_str()))
{ {
tok2 = tok; tok2 = tok;
while (NULL != (tok2 = tok2 ? tok2->previous() : 0)) while (NULL != (tok2 = tok2 ? tok2->previous() : 0))

10
test/teststl.cpp
View File

@ -429,6 +429,16 @@ private:
" }\n" " }\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:6]: (error) Dangerous iterator usage. After erase the iterator is invalid so dereferencing it or comparing it with another iterator is invalid.\n", errout.str()); ASSERT_EQUALS("[test.cpp:6]: (error) Dangerous iterator usage. After erase the iterator is invalid so dereferencing it or comparing it with another iterator is invalid.\n", errout.str());
check("void f()\n"
"{\n"
" std::list<int>::iterator it = foo.begin();\n"
" while (it != i2)\n"
" {\n"
" foo.erase(++it);\n"
" }\n"
"}\n");
ASSERT_EQUALS("[test.cpp:6]: (error) Dangerous iterator usage. After erase the iterator is invalid so dereferencing it or comparing it with another iterator is invalid.\n", errout.str());
} }
void eraseBreak() void eraseBreak()