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

Fix #1454 (False positive: arrayindexoutofbounds, static member sharing local name) 

http://sourceforge.net/apps/trac/cppcheck/ticket/1454
This commit is contained in:
Reijo Tomperi 2010-03-06 14:35:04 +02:00
parent 7c283d1321
commit 237fdbc653
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/tokenize.cpp
View File

@ -2238,16 +2238,18 @@ void Tokenizer::setVarId()
}
}
// Member functions in this source
// Member functions and variables in this source
std::list<Token *> allMemberFunctions;
std::list<Token *> allMemberVars;
{
const std::string funcpattern("%var% :: %var% (");
for (Token *tok2 = _tokens; tok2; tok2 = tok2->next())
{
// Found a class function..
if (Token::Match(tok2, funcpattern.c_str()))
if (Token::Match(tok2, "%var% :: %var%"))
{
allMemberFunctions.push_back(tok2);
if (Token::simpleMatch(tok2->tokAt(3), "("))
allMemberFunctions.push_back(tok2);
else if (tok2->tokAt(2)->varId() != 0)
allMemberVars.push_back(tok2);
}
}
}
@ -2286,6 +2288,16 @@ void Tokenizer::setVarId()
if (varlist.empty())
continue;
// Member variables
for (std::list<Token *>::iterator func = allMemberVars.begin(); func != allMemberVars.end(); ++func)
{
if (!Token::simpleMatch(*func, classname.c_str()))
continue;
Token *tok2 = *func;
tok2 = tok2->tokAt(2);
tok2->varId(varlist[tok2->str()]);
}
// Member functions for this class..
std::list<Token *> funclist;
@ -2310,10 +2322,6 @@ void Tokenizer::setVarId()
}
}
// Are there any member functions for this class?
if (funclist.empty())
continue;
// Update the variable ids..
// Parse each function..
for (std::list<Token *>::iterator func = funclist.begin(); func != funclist.end(); ++func)

2
test/testtokenize.cpp
View File

@ -1862,7 +1862,7 @@ private:
"10: A :: buf@1 [ 10 ] = 0 ;\n"
"11: }\n");
TODO_ASSERT_EQUALS(expected, actual);
ASSERT_EQUALS(expected, actual);
}
void varidclass7()