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

Fixed #1648 (mismatch allocate and deallocate calls.)

This commit is contained in:
Daniel Marjamäki 2010-05-09 13:46:13 +02:00
parent 7c52c8683d
commit d7118c4d36
2 changed files with 79 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lib/checkmemoryleak.cpp
View File

@ -397,47 +397,57 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Token *tok)
while (tok->str() != "{")
tok = tok->next();
tok = tok ? tok->next() : 0;
// Inspect the statements..
// Get return pointer..
unsigned int varid = 0;
AllocType allocType = No;
while (tok)
unsigned int indentlevel = 0;
for (const Token *tok2 = tok; tok2; tok2 = tok2->next())
{
// variable declaration..
if (Token::Match(tok, "%type% * %var% ;"))
if (tok2->str() == "{")
++indentlevel;
else if (tok2->str() == "}")
{
tok = tok->tokAt(4);
continue;
if (indentlevel <= 1)
return No;
}
if (varid == 0 && tok->varId() && Token::Match(tok, "%var% ="))
if (Token::Match(tok2, "return %var% ;"))
{
if (indentlevel != 1)
return No;
varid = tok2->next()->varId();
break;
}
else if (tok2->str() == "return")
{
AllocType allocType = getAllocationType(tok2->next(), 0);
if (allocType != No)
return allocType;
allocType = getReallocationType(tok2->next(), 0);
if (allocType != No)
return allocType;
}
}
// Not returning pointer value..
if (varid == 0)
return No;
// Check if return pointer is allocated..
AllocType allocType = No;
while (0 != (tok = tok->next()))
{
if (Token::Match(tok, "%varid% =", varid))
{
varid = tok->varId();
allocType = getAllocationType(tok->tokAt(2), varid);
if (allocType == No)
return No;
while (tok && tok->str() != ";")
tok = tok->next();
tok = tok ? tok->next() : 0;
continue;
}
if (tok->str() == ";")
{
tok = tok->next();
continue;
}
if (tok->str() == "return")
{
if (varid > 0 && Token::Match(tok->next(), "%varid% ;", varid))
{
allocType = getReallocationType(tok->tokAt(2), varid);
}
if (allocType != No)
return allocType;
return getAllocationType(tok->next(), varid);
}
return No;
if (tok->str() == "return")
return allocType;
}
return No;
@ -587,7 +597,13 @@ const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<co
const Token *ftok = _tokenizer->getFunctionTokenByName(funcname.c_str());
AllocType a = functionReturnType(ftok);
if (a != No)
{
if (alloctype == No)
alloctype = a;
else if (alloctype != a)
alloctype = Many;
return "alloc";
}
}
// how many parameters is there in the function call?

33
test/testmemleak.cpp
View File

@ -296,6 +296,7 @@ private:
TEST_CASE(allocfunc1);
TEST_CASE(allocfunc2);
TEST_CASE(allocfunc3);
TEST_CASE(allocfunc4);
TEST_CASE(throw1);
TEST_CASE(throw2);
@ -1625,7 +1626,7 @@ private:
"{\n"
" FILE *p = a();\n"
"}\n");
ASSERT_EQUALS(std::string("[test.cpp:8]: (error) Memory leak: p\n"), errout.str());
ASSERT_EQUALS(std::string("[test.cpp:8]: (error) Resource leak: p\n"), errout.str());
check("char *a()\n"
"{\n"
@ -1690,6 +1691,36 @@ private:
ASSERT_EQUALS(std::string("[test.cpp:8]: (error) Memory leak: p\n"), errout.str());
}
void allocfunc4()
{
check("char* foo()\n"
"{\n"
" char *str = NULL;\n"
" str = realloc( str, 20 );\n"
" return str;\n"
"}\n"
"\n"
"void bar()\n"
"{\n"
" char *p = foo();\n"
"}\n");
ASSERT_EQUALS(std::string("[test.cpp:11]: (error) Memory leak: p\n"), errout.str());
check("char* foo()\n"
"{\n"
" char *str = NULL;\n"
" str = realloc( str, 20 );\n"
" return str;\n"
"}\n"
"\n"
"void bar()\n"
"{\n"
" char *p = foo();\n"
" delete p;\n"
"}\n");
ASSERT_EQUALS(std::string("[test.cpp:11]: (error) Mismatching allocation and deallocation: p\n"), errout.str());
}