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

Refactorizations in CheckMemoryLeakInClass::variable 

- Bailout for functions that are not implemented (should fix performance downgrade introduced in fb4709f)
- Jump behind arguments
- Removed unnecessary pop_back operations - container gets destroyed after it.
This commit is contained in:
PKEuS 2012-04-23 15:23:01 +02:00
parent d0b7a3514b
commit 5086ae7c31
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/checkmemoryleak.cpp
View File

@ -2400,8 +2400,8 @@ void CheckMemoryLeakInClass::check()
void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarname) void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarname)
{ {
const std::string varname = tokVarname->str(); const std::string& varname = tokVarname->str();
const std::string classname = scope->className; const std::string& classname = scope->className;
// Check if member variable has been allocated and deallocated.. // Check if member variable has been allocated and deallocated..
CheckMemoryLeak::AllocType Alloc = CheckMemoryLeak::No; CheckMemoryLeak::AllocType Alloc = CheckMemoryLeak::No;
@ -2413,15 +2413,16 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
// Inspect member functions // Inspect member functions
std::list<Function>::const_iterator func; std::list<Function>::const_iterator func;
for (func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
if (!func->hasBody)
continue;
const bool constructor = func->type == Function::eConstructor; const bool constructor = func->type == Function::eConstructor;
const bool destructor = func->type == Function::eDestructor; const bool destructor = func->type == Function::eDestructor;
bool body = false; bool body = false;
bool initlist = func->token->linkAt(1)->strAt(1) == ":"; const Token *end = func->start->link();
const Token *end = func->start?func->start->link():0; for (const Token *tok = func->token->linkAt(1); tok != end; tok = tok->next()) {
for (const Token *tok = func->token; tok != end; tok = tok->next()) {
if (tok == func->start) if (tok == func->start)
body = true; body = true;
else if (initlist || body) { else {
if (!body) { if (!body) {
if (!Token::Match(tok, (":|, " + varname + " (").c_str())) if (!Token::Match(tok, (":|, " + varname + " (").c_str()))
continue; continue;
@ -2452,7 +2453,6 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
if (alloc != CheckMemoryLeak::Many && Dealloc != CheckMemoryLeak::No && Dealloc != CheckMemoryLeak::Many && Dealloc != alloc) { if (alloc != CheckMemoryLeak::Many && Dealloc != CheckMemoryLeak::No && Dealloc != CheckMemoryLeak::Many && Dealloc != alloc) {
callstack.push_back(tok); callstack.push_back(tok);
mismatchAllocDealloc(callstack, classname + "::" + varname); mismatchAllocDealloc(callstack, classname + "::" + varname);
callstack.pop_back();
} }
Alloc = alloc; Alloc = alloc;
@ -2488,7 +2488,6 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
if (dealloc != CheckMemoryLeak::Many && Alloc != CheckMemoryLeak::No && Alloc != Many && Alloc != dealloc) { if (dealloc != CheckMemoryLeak::Many && Alloc != CheckMemoryLeak::No && Alloc != Many && Alloc != dealloc) {
callstack.push_back(tok); callstack.push_back(tok);
mismatchAllocDealloc(callstack, classname + "::" + varname); mismatchAllocDealloc(callstack, classname + "::" + varname);
callstack.pop_back();
} }
Dealloc = dealloc; Dealloc = dealloc;