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

memory leak for struct member: made the checking more sensitive. Skip bail-out execution paths were the member is properly deallocated

This commit is contained in:
Daniel Marjamäki 2009-07-20 14:39:24 +02:00
parent ddaea3244d
commit 74699cab66
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/checkmemoryleak.cpp
View File

@ -1964,7 +1964,7 @@ void CheckMemoryLeakStructMember::check()
// Check struct.. // Check struct..
unsigned int indentlevel2 = 0; unsigned int indentlevel2 = 0;
for (const Token *tok2 = tok; tok2; tok2 = tok2->next()) for (const Token *tok2 = vartok; tok2; tok2 = tok2->next())
{ {
if (tok2->str() == "{") if (tok2->str() == "{")
++indentlevel2; ++indentlevel2;
@ -2001,7 +2001,29 @@ void CheckMemoryLeakStructMember::check()
// Deallocating the struct member.. // Deallocating the struct member..
else if (Token::Match(tok3, "free|kfree ( %var% . %varid% )", structmemberid)) else if (Token::Match(tok3, "free|kfree ( %var% . %varid% )", structmemberid))
break; {
// If the deallocation happens at the base level, don't check this member anymore
if (indentlevel3 == 0)
break;
// deallocating and then returning from function in a conditional block =>
// skip ahead out of the block
bool ret = false;
while (tok3)
{
// debug info
const std::string tok3str_(tok3->str());
if (tok3->str() == "return")
ret = true;
else if (tok3->str() == "{" || tok3->str() == "}")
break;
tok3 = tok3->next();
}
if (!ret || !tok3 || tok3->str() != "}")
break;
--indentlevel3;
continue;
}
// Deallocating the struct.. // Deallocating the struct..
else if (Token::Match(tok3, "free|kfree ( %varid% )", structid)) else if (Token::Match(tok3, "free|kfree ( %varid% )", structid))

12
test/testmemleak.cpp
View File

@ -2873,6 +2873,18 @@ private:
" return abc;\n" " return abc;\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:8]: (error) Memory leak: abc.a\n", errout.str()); ASSERT_EQUALS("[test.cpp:8]: (error) Memory leak: abc.a\n", errout.str());
check("static void foo(int a)\n"
"{\n"
" ABC *abc = malloc(sizeof(ABC));\n"
" abc->a = malloc(10);\n"
" if (a == 1)\n"
" {\n"
" free(abc->a);\n"
" return;\n"
" }\n"
"}\n");
ASSERT_EQUALS("[test.cpp:10]: (error) Memory leak: abc.a\n", errout.str());
} }
void goto_() void goto_()