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

Fixed #733 (New check: locking & unlocking mutex and semaphore variables)

This commit is contained in:
Daniel Marjamäki 2009-10-03 21:46:22 +02:00
parent b0d8b6ca8b
commit 4387071eb1
2 changed files with 301 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/checkmemoryleak.cpp
View File

@ -326,7 +326,10 @@ void CheckMemoryLeak::memleakError(const Token *tok, const std::string &varname,
void CheckMemoryLeak::resourceLeakError(const Token *tok, const std::string &varname, bool all) void CheckMemoryLeak::resourceLeakError(const Token *tok, const std::string &varname, bool all)
{ {
reportErr(tok, all ? Severity::possibleError : Severity::error, "resourceLeak", "Resource leak: " + varname); std::string errmsg("Resource leak");
if (!varname.empty())
errmsg += ": " + varname;
reportErr(tok, all ? Severity::possibleError : Severity::error, "resourceLeak", errmsg);
} }
void CheckMemoryLeak::deallocDeallocError(const Token *tok, const std::string &varname) void CheckMemoryLeak::deallocDeallocError(const Token *tok, const std::string &varname)
@ -472,7 +475,7 @@ const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<co
sizeof(call_func_white_list[0]), call_func_white_list_compare)) sizeof(call_func_white_list[0]), call_func_white_list_compare))
return 0; return 0;
if (getAllocationType(tok, varid) != No || getReallocationType(tok, varid) != No || getDeallocationType(tok, varid) != No) if (varid > 0 && (getAllocationType(tok, varid) != No || getReallocationType(tok, varid) != No || getDeallocationType(tok, varid) != No))
return 0; return 0;
if (callstack.size() > 2) if (callstack.size() > 2)
@ -481,11 +484,31 @@ const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<co
const std::string funcname(tok->str()); const std::string funcname(tok->str());
for (std::list<const Token *>::const_iterator it = callstack.begin(); it != callstack.end(); ++it) for (std::list<const Token *>::const_iterator it = callstack.begin(); it != callstack.end(); ++it)
{ {
if ((*it)->str() == funcname) if ((*it) && (*it)->str() == funcname)
return "recursive"; return "recursive";
} }
callstack.push_back(tok); callstack.push_back(tok);
// lock/unlock..
if (varid == 0)
{
const Token *ftok = _tokenizer->getFunctionTokenByName(funcname.c_str());
while (ftok && (ftok->str() != "{"))
ftok = ftok->next();
if (!ftok)
return 0;
Token *func = getcode(ftok->tokAt(1), callstack, 0, alloctype, dealloctype, false, all, 1);
simplifycode(func, all);
const char *ret = 0;
if (Token::simpleMatch(func, "; alloc ; }"))
ret = "alloc";
else if (Token::simpleMatch(func, "; dealloc ; }"))
ret = "dealloc";
Tokenizer::deleteTokens(func);
return ret;
}
// Check if this is a function that allocates memory.. // Check if this is a function that allocates memory..
{ {
const Token *ftok = _tokenizer->getFunctionTokenByName(funcname.c_str()); const Token *ftok = _tokenizer->getFunctionTokenByName(funcname.c_str());
@ -519,7 +542,7 @@ const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<co
{ {
if (tok->str() == ",") if (tok->str() == ",")
++par; ++par;
if (Token::Match(tok, "[,()] %varid% [,()]", varid)) if (varid > 0 && Token::Match(tok, "[,()] %varid% [,()]", varid))
{ {
const Token *ftok = _tokenizer->getFunctionTokenByName(funcname.c_str()); const Token *ftok = _tokenizer->getFunctionTokenByName(funcname.c_str());
if (!ftok) if (!ftok)
@ -568,7 +591,7 @@ const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<co
Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Token *> callstack, unsigned int varid, AllocType &alloctype, AllocType &dealloctype, bool classmember, bool &all, unsigned int sz) Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Token *> callstack, unsigned int varid, CheckMemoryLeak::AllocType &alloctype, CheckMemoryLeak::AllocType &dealloctype, bool classmember, bool &all, unsigned int sz)
{ {
Token *rethead = 0, *rettail = 0; Token *rethead = 0, *rettail = 0;
#define addtoken(_str) \ #define addtoken(_str) \
@ -620,6 +643,35 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
if (parlevel == 0 && tok->str() == ";") if (parlevel == 0 && tok->str() == ";")
addtoken(";"); addtoken(";");
if (varid == 0)
{
if (!callstack.empty() && Token::Match(tok, "[;{}] __cppcheck_lock|__cppcheck_unlock ( ) ;"))
{
// Type of leak = Resource leak
alloctype = dealloctype = CheckMemoryLeak::File;
if (tok->next()->str() == "__cppcheck_lock")
{
addtoken("alloc");
}
else
{
addtoken("dealloc");
}
tok = tok->tokAt(3);
continue;
}
if (tok->str() == "if")
{
addtoken("if");
tok = tok->next()->link();
continue;
}
}
else
{
// var = strcpy|.. ( var , // var = strcpy|.. ( var ,
if (Token::Match(tok, "[;{}] %varid% = memcpy|memmove|memset|strcpy|strncpy|strcat|strncat ( %varid% ,", varid)) if (Token::Match(tok, "[;{}] %varid% = memcpy|memmove|memset|strcpy|strncpy|strcat|strncat ( %varid% ,", varid))
{ {
@ -630,7 +682,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
if (Token::Match(tok->previous(), "[(;{}] %varid% =", varid) || if (Token::Match(tok->previous(), "[(;{}] %varid% =", varid) ||
Token::Match(tok, "asprintf ( & %varid% ,", varid)) Token::Match(tok, "asprintf ( & %varid% ,", varid))
{ {
AllocType alloc; CheckMemoryLeak::AllocType alloc;
if (Token::simpleMatch(tok, "asprintf (")) if (Token::simpleMatch(tok, "asprintf ("))
{ {
@ -656,10 +708,10 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
mismatchSizeError(tok->tokAt(4), tok->strAt(4)); mismatchSizeError(tok->tokAt(4), tok->strAt(4));
} }
if (alloc == No) if (alloc == CheckMemoryLeak::No)
{ {
alloc = getReallocationType(tok->tokAt(2), varid); alloc = getReallocationType(tok->tokAt(2), varid);
if (alloc != No) if (alloc != CheckMemoryLeak::No)
{ {
addtoken("realloc"); addtoken("realloc");
addtoken(";"); addtoken(";");
@ -670,7 +722,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
} }
// If "--all" hasn't been given, don't check classes.. // If "--all" hasn't been given, don't check classes..
if (alloc == New) if (alloc == CheckMemoryLeak::New)
{ {
if (Token::Match(tok->tokAt(2), "new %type% [(;]")) if (Token::Match(tok->tokAt(2), "new %type% [(;]"))
{ {
@ -842,6 +894,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
} }
} }
} }
}
if ((tok->str() == "else") || (tok->str() == "switch")) if ((tok->str() == "else") || (tok->str() == "switch"))
{ {
@ -876,17 +929,21 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
{ {
addtoken("do"); addtoken("do");
} }
if (isloop && notvar(tok, varid)) if (varid > 0 && isloop && notvar(tok, varid))
{
addtoken("!var"); addtoken("!var");
}
// continue / break.. // continue / break..
if (tok->str() == "continue") if (tok->str() == "continue")
{
addtoken("continue"); addtoken("continue");
if (tok->str() == "break") }
else if (tok->str() == "break")
{
addtoken("break"); addtoken("break");
}
// goto.. else if (tok->str() == "goto")
if (tok->str() == "goto")
{ {
addtoken("goto"); addtoken("goto");
} }
@ -895,6 +952,15 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
else if (tok->str() == "return") else if (tok->str() == "return")
{ {
addtoken("return"); addtoken("return");
if (varid == 0)
{
addtoken(";");
while (tok && tok->str() != ";")
tok = tok->next();
if (!tok)
break;
continue;
}
// Returning a auto_ptr of this allocated variable.. // Returning a auto_ptr of this allocated variable..
if (Token::simpleMatch(tok->next(), "std :: auto_ptr <")) if (Token::simpleMatch(tok->next(), "std :: auto_ptr <"))
@ -1010,12 +1076,18 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
const char *str = call_func(tok, callstack, varid, alloctype, dealloctype, all, sz); const char *str = call_func(tok, callstack, varid, alloctype, dealloctype, all, sz);
if (str) if (str)
{ {
if (Token::Match(tok->tokAt(-2), "%varid% =", varid) || std::string(str) != "alloc") if (varid == 0)
{
addtoken(str); addtoken(str);
} }
else else if (str != std::string("alloc") ||
Token::Match(tok->tokAt(-2), "%varid% =", varid))
{ {
if (getReallocationType(tok, varid) != No && addtoken(str);
}
}
else if (varid > 0 &&
getReallocationType(tok, varid) != No &&
tok->tokAt(2)->varId() == varid) tok->tokAt(2)->varId() == varid)
{ {
addtoken("if"); addtoken("if");
@ -1028,7 +1100,6 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
} }
} }
} }
}
// Callback.. // Callback..
bool matchFirst = Token::Match(tok, "( %var%"); bool matchFirst = Token::Match(tok, "( %var%");
@ -1055,7 +1126,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
} }
// Linux lists.. // Linux lists..
if (Token::Match(tok, "[=(,] & %varid% [.[,)]", varid)) if (varid > 0 && Token::Match(tok, "[=(,] & %varid% [.[,)]", varid))
{ {
addtoken("&use"); addtoken("&use");
} }
@ -1841,7 +1912,10 @@ void CheckMemoryLeakInFunction::check()
if (indentlevel == 0) if (indentlevel == 0)
{ {
if (Token::simpleMatch(tok, ") {")) if (Token::simpleMatch(tok, ") {"))
{
infunc = true; infunc = true;
checkScope(tok->tokAt(2), "", 0, classmember, 1);
}
else if (tok->str() == "(") else if (tok->str() == "(")
beforeParameters = false; beforeParameters = false;

7
test/testmemleak.cpp
View File

@ -287,6 +287,7 @@ private:
// getcode.. // getcode..
CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, 0, 0); CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, 0, 0);
std::list<const Token *> callstack; std::list<const Token *> callstack;
callstack.push_back(0);
CheckMemoryLeak::AllocType allocType, deallocType; CheckMemoryLeak::AllocType allocType, deallocType;
allocType = deallocType = CheckMemoryLeak::No; allocType = deallocType = CheckMemoryLeak::No;
bool all = false; bool all = false;
@ -322,6 +323,12 @@ private:
// alloc; return; // alloc; return;
ASSERT_EQUALS(";;alloc;return;", getcode("char *s = new char[100]; return 0;", "s")); ASSERT_EQUALS(";;alloc;return;", getcode("char *s = new char[100]; return 0;", "s"));
// lock/unlock..
ASSERT_EQUALS(";;alloc;", getcode("int a; __cppcheck_lock();", ""));
ASSERT_EQUALS(";;callfunc;", getcode("int a; __cppcheck_lock();", "a"));
ASSERT_EQUALS(";;dealloc;", getcode("int a; __cppcheck_unlock();", ""));
ASSERT_EQUALS(";;callfunc;", getcode("int a; __cppcheck_unlock();", "a"));
// dealloc; // dealloc;
ASSERT_EQUALS(";;dealloc;", getcode("char *s; free(s);", "s")); ASSERT_EQUALS(";;dealloc;", getcode("char *s; free(s);", "s"));
ASSERT_EQUALS(";;dealloc;", getcode("char *s; free((void *)s);", "s")); ASSERT_EQUALS(";;dealloc;", getcode("char *s; free((void *)s);", "s"));