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

Reverted my changes I made by mistake in previous commit

This commit is contained in:
Daniel Marjamäki 2015-05-02 14:01:31 +02:00
parent 28985d1baa
commit dc54676289
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/checkstl.cpp
View File

@ -1535,10 +1535,14 @@ void CheckStl::readingEmptyStlContainer()
if (i->type != Scope::eFunction) if (i->type != Scope::eFunction)
continue; continue;
const Token* restartTok = nullptr;
for (const Token *tok = i->classStart->next(); tok != i->classEnd; tok = tok->next()) { for (const Token *tok = i->classStart->next(); tok != i->classEnd; tok = tok->next()) {
if (Token::Match(tok, "for|while|do|}")) { // Loops and end of scope clear the sets. if (Token::Match(tok, "for|while")) { // Loops and end of scope clear the sets.
restartTok = tok->linkAt(1); // Check condition to catch looping over empty containers
} else if (tok == restartTok || Token::Match(tok, "do|}")) {
empty_map.clear(); empty_map.clear();
empty_nonmap.clear(); empty_nonmap.clear();
restartTok = nullptr;
} }
if (!tok->varId()) if (!tok->varId())

7
test/teststl.cpp
View File

@ -2664,6 +2664,13 @@ private:
" std::string strValue2 = CMap[1];\n" " std::string strValue2 = CMap[1];\n"
"}\n", true); "}\n", true);
ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Reading from empty STL container\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Reading from empty STL container\n", errout.str());
// #4306
check("void f(std::vector<int> v) {\n"
" v.clear();\n"
" for(int i = 0; i < v.size(); i++) { cout << v[i]; }\n"
"}", true);
ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Reading from empty STL container\n", errout.str());
} }
}; };