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

CheckMemoryLeak: Fix FP for allocation functions that register memory before returning it

This commit is contained in:
Daniel Marjamäki 2015-01-05 13:23:38 +01:00
parent fb685f096a
commit a80101f277
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkmemoryleak.cpp
View File

@ -449,8 +449,11 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* f
if (Token::Match(tok, "[(,] %varid% [,)]", varid)) { if (Token::Match(tok, "[(,] %varid% [,)]", varid)) {
return No; return No;
} }
if (tok->str() == "return") if (Token::Match(tok, "[(,] & %varid% [.,)]", varid)) {
return allocType; return No;
}
if (allocType == No && tok->str() == "return")
return No;
} }
return allocType; return allocType;

14
test/testmemleak.cpp
View File

@ -253,6 +253,7 @@ private:
TEST_CASE(allocfunc11); TEST_CASE(allocfunc11);
TEST_CASE(allocfunc12); // #3660: allocating and returning non-local pointer => not allocfunc TEST_CASE(allocfunc12); // #3660: allocating and returning non-local pointer => not allocfunc
TEST_CASE(allocfunc13); // Ticket #4494 and #4540 - class function TEST_CASE(allocfunc13); // Ticket #4494 and #4540 - class function
TEST_CASE(allocfunc14); // Use pointer before returning it
TEST_CASE(throw1); TEST_CASE(throw1);
TEST_CASE(throw2); TEST_CASE(throw2);
@ -2827,6 +2828,19 @@ private:
ASSERT_EQUALS("[test.cpp:11]: (error) Memory leak: a\n", errout.str()); ASSERT_EQUALS("[test.cpp:11]: (error) Memory leak: a\n", errout.str());
} }
void allocfunc14() { // use pointer before returning it
check("static struct ABC * newabc() {\n"
" struct ABC *abc = malloc(sizeof(struct ABC));\n"
" init_abc(&abc->a);\n" // <- might take address
" return abc;\n"
"}\n"
"\n"
"static void f() {\n"
" struct ABC *abc = newabc();\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void throw1() { void throw1() {
check("void foo()\n" check("void foo()\n"
"{\n" "{\n"