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

Merge pull request #858 from simartin/ticket_7820 

Ticket #7820: Properly report leaks with conditional deallocations followed by a return.
This commit is contained in:
amai2012 2017-01-18 09:31:49 +01:00 committed by GitHub
parent 9e2650db96 9e76b21d7f
commit 722fac391d
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkmemoryleak.cpp
View File

@ -1979,8 +1979,8 @@ const Token *CheckMemoryLeakInFunction::findleak(const Token *tokens)
return result->tokAt(4);
}
if (((result = Token::findsimplematch(tokens, "; alloc ; if dealloc ; }")) != nullptr) &&
!result->tokAt(7)) {
if (((result = Token::findsimplematch(tokens, "; alloc ; if dealloc ; }")) != nullptr) ||
((result = Token::findsimplematch(tokens, "; alloc ; if dealloc ; return ;")) != nullptr)) {
return result->tokAt(6);
}

34
test/testmemleak.cpp
View File

@ -316,6 +316,7 @@ private:
TEST_CASE(autoptr1);
TEST_CASE(if_with_and);
TEST_CASE(assign_pclose);
TEST_CASE(conditional_dealloc_return); // #7820
// Using the function "exit"
TEST_CASE(exit2);
@ -3416,6 +3417,39 @@ private:
ASSERT_EQUALS("", errout.str());
}
void conditional_dealloc_return() { // #7820
check("void f() {\n"
" FILE *pPipe = popen(\"foo\", \"r\");\n"
" if (feof(pPipe))\n"
" pclose(pPipe);\n"
" return;\n"
"}", /*c=*/true, /*posix=*/true);
ASSERT_EQUALS("[test.c:5]: (error) Resource leak: pPipe\n", errout.str());
check("extern int bar();\n"
"void f() {\n"
" char *c = (char*) malloc(10);\n"
" if (bar())\n"
" free(c);\n"
" return;\n"
"}", /*c=*/true);
ASSERT_EQUALS("[test.c:6]: (error) Memory leak: c\n", errout.str());
check("extern int bar();\n"
"extern int baz();\n"
"extern void bos(char*);\n"
"void f() {\n"
" char *c;\n"
" if(bar()) {\n"
" bos(c);\n"
" c = (char*) malloc(10);\n"
" if (baz())\n"
" free(c);\n"
" };\n"
"}", /*c=*/true);
ASSERT_EQUALS("[test.c:11]: (error) Memory leak: c\n", errout.str());
}
void exit2() {
check("void f()\n"
"{\n"