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

Fixed #614 (If you see this, there is a bug ###### Token::Match() - varid was 0) 

http://sourceforge.net/apps/trac/cppcheck/ticket/614
This commit is contained in:
Slava Semushin 2009-08-26 02:44:19 +07:00
parent 311fb1a1f8
commit 8dcb846627
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/checkmemoryleak.cpp
View File

@ -627,7 +627,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
if (parlevel == 0 && tok->str() == ";")
addtoken(";");
if (Token::Match(tok->previous(), "[(;{}] %varid% =", varid))
if (varid && Token::Match(tok->previous(), "[(;{}] %varid% =", varid))
{
AllocType alloc = getAllocationType(tok->tokAt(2), varid);
bool realloc = false;
@ -870,12 +870,12 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
}
}
else if (Token::Match(tok, "return &| %varid%", varid))
else if (varid && Token::Match(tok, "return &| %varid%", varid))
{
addtoken("use");
}
else if (Token::Match(tok, "return strcpy|strncpy|memcpy ( %varid%", varid))
else if (varid && Token::Match(tok, "return strcpy|strncpy|memcpy ( %varid%", varid))
{
addtoken("use");
tok = tok->tokAt(2);
@ -909,16 +909,19 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
}
// Assignment..
if (Token::Match(tok, "[)=] %varid% [+;)]", varid) ||
Token::Match(tok, "%varid% +=|-=", varid) ||
Token::Match(tok, "+=|<< %varid% ;", varid) ||
Token::Match(tok, "= strcpy|strcat|memmove|memcpy ( %varid% ,", varid))
if (varid)
{
addtoken("use");
}
else if (Token::Match(tok->previous(), "[;{}=(,+-*/] %varid% [", varid))
{
addtoken("use_");
if (Token::Match(tok, "[)=] %varid% [+;)]", varid) ||
Token::Match(tok, "%varid% +=|-=", varid) ||
Token::Match(tok, "+=|<< %varid% ;", varid) ||
Token::Match(tok, "= strcpy|strcat|memmove|memcpy ( %varid% ,", varid))
{
addtoken("use");
}
else if (Token::Match(tok->previous(), "[;{}=(,+-*/] %varid% [", varid))
{
addtoken("use_");
}
}
// Investigate function calls..