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

Symbol database: refactor CheckMemoryLeakInClass::checkPublicFunctions to use the symbol database. Ticket: #2219

This commit is contained in:
Robert Reif 2010-11-25 21:04:49 +01:00 committed by Daniel Marjamäki
parent 0a744c0c6e
commit 88a1448a07
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/checkmemoryleak.cpp
View File

@ -2597,11 +2597,17 @@ void CheckMemoryLeakInClass::check()
if (!var->isStatic && var->token->previous()->str() == "*") if (!var->isStatic && var->token->previous()->str() == "*")
{ {
// allocation but no deallocation of private variables in public function.. // allocation but no deallocation of private variables in public function..
if (var->access == SymbolDatabase::Private && var->token->tokAt(-2)->isStandardType())
checkPublicFunctions(var->token, var->token->varId());
if (var->token->tokAt(-2)->isStandardType()) if (var->token->tokAt(-2)->isStandardType())
{
if (var->access == SymbolDatabase::Private)
checkPublicFunctions(info, var->token);
variable(info, var->token); variable(info, var->token);
}
else
{
/** @todo false negative: check classes here someday */
}
} }
} }
} }
@ -2745,7 +2751,7 @@ void CheckMemoryLeakInClass::variable(const SymbolDatabase::SpaceInfo *classinfo
} }
void CheckMemoryLeakInClass::checkPublicFunctions(const Token *classtok, const unsigned int varid) void CheckMemoryLeakInClass::checkPublicFunctions(const SymbolDatabase::SpaceInfo *spaceinfo, const Token *classtok)
{ {
// Check that public functions deallocate the pointers that they allocate. // Check that public functions deallocate the pointers that they allocate.
// There is no checking how these functions are used and therefore it // There is no checking how these functions are used and therefore it
@ -2753,34 +2759,27 @@ void CheckMemoryLeakInClass::checkPublicFunctions(const Token *classtok, const u
if (!_settings->_checkCodingStyle) if (!_settings->_checkCodingStyle)
return; return;
const unsigned int varid = classtok->varId();
// Parse public functions.. // Parse public functions..
// If they allocate member variables, they should also deallocate // If they allocate member variables, they should also deallocate
bool publicScope = false; std::list<SymbolDatabase::Func>::const_iterator func;
for (const Token *tok = classtok; tok; tok = tok->next())
{
if (tok->str() == "{")
tok = tok->link();
else if (tok->str() == "}")
break;
else if (tok->isName() && tok->str().find(":") != std::string::npos)
publicScope = bool(tok->str() == "public:");
// scope of public function.. // TODO: parse into any function scope that is not a constructor
// TODO: parse into any function scope that is not a constructor for (func = spaceinfo->functionList.begin(); func != spaceinfo->functionList.end(); ++func)
else if (publicScope && (Token::Match(tok, "void %type% (") || Token::simpleMatch(tok, "operator = ("))) {
/** @todo false negative: why do we only check inline functions? */
if (func->access == SymbolDatabase::Public && func->hasBody && func->isInline)
{ {
tok = tok->tokAt(2)->link(); const Token *tok2 = func->token;
if (Token::Match(tok, ") const| {")) while (tok2->str() != "{")
tok2 = tok2->next();
/** @todo false negative: why do we only check for this specific case? */
if (Token::Match(tok2, "{ %varid% =", varid))
{ {
const Token *tok2 = tok; const CheckMemoryLeak::AllocType alloc = getAllocationType(tok2->tokAt(3), varid);
while (tok2->str() != "{") if (alloc != CheckMemoryLeak::No)
tok2 = tok2->next(); publicAllocationError(tok2, tok2->strAt(1));
if (Token::Match(tok2, "{ %varid% =", varid))
{
const CheckMemoryLeak::AllocType alloc = getAllocationType(tok2->tokAt(3), varid);
if (alloc != CheckMemoryLeak::No)
publicAllocationError(tok2, tok2->strAt(1));
}
} }
} }
} }

2
lib/checkmemoryleak.h
View File

@ -380,7 +380,7 @@ private:
void variable(const SymbolDatabase::SpaceInfo *spaceinfo, const Token *tokVarname); void variable(const SymbolDatabase::SpaceInfo *spaceinfo, const Token *tokVarname);
/** Public functions: possible double-allocation */ /** Public functions: possible double-allocation */
void checkPublicFunctions(const Token *classtok, const unsigned int varid); void checkPublicFunctions(const SymbolDatabase::SpaceInfo *spaceinfo, const Token *classtok);
void publicAllocationError(const Token *tok, const std::string &varname); void publicAllocationError(const Token *tok, const std::string &varname);
void getErrorMessages() void getErrorMessages()