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

Fixed #4229

This commit is contained in:
PKEuS 2012-12-07 11:45:20 -08:00
parent 1f87961c16
commit 65db8b8b9f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkother.cpp
View File

@ -666,7 +666,7 @@ static void eraseNotLocalArg(std::map<unsigned int, const Token*>& container, co
{ {
for (std::map<unsigned int, const Token*>::iterator i = container.begin(); i != container.end();) { for (std::map<unsigned int, const Token*>::iterator i = container.begin(); i != container.end();) {
const Variable* var = symbolDatabase->getVariableFromVarId(i->first); const Variable* var = symbolDatabase->getVariableFromVarId(i->first);
if (!var || (!var->isLocal() && !var->isArgument())) { if (!var || (!var->isLocal() && !var->isArgument()) || var->isStatic()) {
container.erase(i++); container.erase(i++);
if (i == container.end()) if (i == container.end())
break; break;

15
test/testother.cpp
View File

@ -6544,6 +6544,13 @@ private:
"}"); "}");
ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Variable 'i' is reassigned a value before the old one has been used.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Variable 'i' is reassigned a value before the old one has been used.\n", errout.str());
check("void f() {\n"
" static int i;\n"
" i = 1;\n"
" i = 1;\n"
"}");
ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Variable 'i' is reassigned a value before the old one has been used.\n", errout.str());
// Testing different types // Testing different types
check("void f() {\n" check("void f() {\n"
" Foo& bar = foo();\n" " Foo& bar = foo();\n"
@ -6573,6 +6580,14 @@ private:
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f() {\n"
" static int i;\n"
" i = 1;\n"
" bar();\n" // bar() might call f() recursively. This could be a false positive in more complex examples (when value of i is used somewhere. See #4229)
" i = 2;\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void f() {\n" check("void f() {\n"
" int i;\n" " int i;\n"
" i = 1;\n" " i = 1;\n"