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

CheckMemoryLeak: Refactoring the code

This commit is contained in:
Daniel Marjamäki 2011-03-06 09:42:16 +01:00
parent 779dba9160
commit ca4015f905
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/checkmemoryleak.cpp
View File

@ -1588,17 +1588,19 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
}
// Callback..
bool matchFirst = Token::Match(tok, "( %var%");
if (matchFirst || Token::Match(tok, "( * %var%"))
if (Token::Match(tok, "( *| %var%") && Token::simpleMatch(tok->link(),") ("))
{
int tokIdx = matchFirst ? 2 : 3;
const Token *tok2 = tok->next();
if (tok2->str() == "*")
tok2 = tok2->next();
tok2 = tok2->next();
while (Token::Match(tok->tokAt(tokIdx), ". %var%"))
tokIdx += 2;
while (Token::Match(tok2, ". %var%"))
tok2 = tok2->tokAt(2);
if (Token::simpleMatch(tok->tokAt(tokIdx), ") ("))
if (Token::simpleMatch(tok2, ") ("))
{
for (const Token *tok2 = tok->tokAt(tokIdx + 2); tok2; tok2 = tok2->next())
for (; tok2; tok2 = tok2->next())
{
if (Token::Match(tok2, "[;{]"))
break;