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

memory leaks: handling std::auto_ptr (#266)

This commit is contained in:
Daniel Marjamäki 2009-04-28 20:01:35 +02:00
parent 67eb54c4c0
commit bb154da394
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/checkmemoryleak.cpp
View File

@ -607,10 +607,26 @@ Token *CheckMemoryLeakClass::getcode(const Token *tok, std::list<const Token *>
if (tok->str() == "return") if (tok->str() == "return")
{ {
addtoken("return"); addtoken("return");
if (Token::simpleMatch(tok, std::string("return " + varnameStr).c_str()) ||
Token::simpleMatch(tok, std::string("return & " + varnameStr).c_str())) // Returning a auto_ptr of this allocated variable..
if (Token::simpleMatch(tok->next(), "std :: auto_ptr <"))
{
const Token *tok2 = tok->tokAt(5);
while (tok2 && tok2->str() != ">")
tok2 = tok2->next();
if (Token::simpleMatch(tok2, ("> ( " + varnameStr + " )").c_str()))
{
addtoken("use");
tok = tok2->tokAt(3);
}
}
else if (Token::Match(tok, ("return &| " + varnameStr).c_str()))
{
addtoken("use"); addtoken("use");
if (Token::simpleMatch(tok->next(), "(")) }
else if (Token::simpleMatch(tok->next(), "("))
{ {
for (const Token *tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) for (const Token *tok2 = tok->tokAt(2); tok2; tok2 = tok2->next())
{ {

14
test/testmemleak.cpp
View File

@ -203,6 +203,8 @@ private:
// VCL.. // VCL..
TEST_CASE(vcl1); TEST_CASE(vcl1);
TEST_CASE(vcl2); TEST_CASE(vcl2);
TEST_CASE(autoptr1);
} }
@ -2041,6 +2043,18 @@ private:
"}\n", "TButton\n"); "}\n", "TButton\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void autoptr1()
{
check("std::auto_ptr<int> foo()\n"
"{\n"
" int *i = new int;\n"
" return std::auto_ptr<int>(i);\n"
"}");
ASSERT_EQUALS("", errout.str());
}
}; };
REGISTER_TEST(TestMemleak) REGISTER_TEST(TestMemleak)