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

Memory leaks: Improved handling of allocation functions that contains ::. Ticket: #4494

This commit is contained in:
Daniel Marjamäki 2013-01-22 21:33:39 +01:00
parent 444f80c4bb
commit f86e83d813
2 changed files with 85 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkmemoryleak.cpp
View File

@ -140,6 +140,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
if (! tok2->isName())
return No;
if (!Token::Match(tok2, "%type% :: %type%")) {
// Does tok2 point on "malloc", "strdup" or "kmalloc"..
static const char * const mallocfunc[] = {
"malloc",
@ -212,8 +213,13 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
return Dir;
}
}
while (Token::Match(tok2,"%type% :: %type%"))
tok2 = tok2->tokAt(2);
// User function
const Function* func = tokenizer->getSymbolDatabase()->findFunctionByName(tok2->str(), tok2->scope());
const Function* func = tokenizer->getSymbolDatabase()->findFunctionByNameAndArgs(tok2, tok2->scope());
if (func == NULL)
return No;

11
test/testmemleak.cpp
View File

@ -240,6 +240,7 @@ private:
TEST_CASE(allocfunc10);
TEST_CASE(allocfunc11);
TEST_CASE(allocfunc12); // #3660: allocating and returning non-local pointer => not allocfunc
TEST_CASE(allocfunc13); // Ticket #4494 - class function
TEST_CASE(throw1);
TEST_CASE(throw2);
@ -2583,6 +2584,16 @@ private:
ASSERT_EQUALS("", errout.str());
}
void allocfunc13() { // #4494: class function
check("namespace n {\n"
" char *a() { return malloc(100); }\n"
"}\n"
"void b() {\n"
" char *x = n::a();\n"
"}");
ASSERT_EQUALS("[test.cpp:6]: (error) Memory leak: x\n", errout.str());
}
void throw1() {
check("void foo()\n"
"{\n"