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

Fixed #2733 (Memory leak: not all branch are checked)

This commit is contained in:
Daniel Marjamäki 2011-04-20 06:41:14 +02:00
parent 8417c4eb28
commit aac65247ba
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkmemoryleak.cpp
View File

@ -1902,6 +1902,14 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok)
done = false; done = false;
} }
// Remove outer condition..
else if (Token::Match(tok2->next(), "if { if return use ; }"))
{
tok2->tokAt(6)->deleteNext();
Token::eraseTokens(tok2, tok2->tokAt(3));
done = false;
}
continue; continue;
} }

33
test/testmemleak.cpp
View File

@ -232,7 +232,6 @@ private:
TEST_CASE(func22); // Ticket #2668 TEST_CASE(func22); // Ticket #2668
TEST_CASE(func23); // Ticket #2667 TEST_CASE(func23); // Ticket #2667
TEST_CASE(func24); // Ticket #2705 TEST_CASE(func24); // Ticket #2705
TEST_CASE(func25); // Ticket #2733
TEST_CASE(allocfunc1); TEST_CASE(allocfunc1);
TEST_CASE(allocfunc2); TEST_CASE(allocfunc2);
@ -667,6 +666,13 @@ private:
ASSERT_EQUALS("; dealloc ; return ;", simplifycode("; while1 { if callfunc { dealloc ; return ; } else { continue ; } }")); ASSERT_EQUALS("; dealloc ; return ;", simplifycode("; while1 { if callfunc { dealloc ; return ; } else { continue ; } }"));
// remove outer if (#2733)
ASSERT_EQUALS("alloc ; return ; }", simplifycode("alloc ; if { if return use ; } return ; }"));
ASSERT_EQUALS("alloc ; return ; }", simplifycode("alloc ; if { if(var) return use ; } return ; }"));
TODO_ASSERT_EQUALS("alloc ; return ; }",
"alloc ; if(var) { if return use ; } return ; }",
simplifycode("alloc ; if(var) { if return use ; } return ; }"));
// "if ; .." // "if ; .."
ASSERT_EQUALS("; if xxx ;", simplifycode("; if ; else xxx ;")); ASSERT_EQUALS("; if xxx ;", simplifycode("; if ; else xxx ;"));
ASSERT_EQUALS("; if(var) xxx ;", simplifycode("; if(!var) ; else xxx ;")); ASSERT_EQUALS("; if(var) xxx ;", simplifycode("; if(!var) ; else xxx ;"));
@ -2200,31 +2206,6 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
// #2733
void func25()
{
check("int* GetDeviceName(int a, int b)\n"
"{\n"
" int *p = new int[255];\n"
" memset(p, 0, 255 * sizeof(int));\n"
" if(a)\n"
" if(b)\n"
" return p;\n"
" return NULL; \n"
"}\n");
TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory leak: p\n","", errout.str());
check("int* GetDeviceName(int a)\n"
"{\n"
" int *p = new int[255];\n"
" memset(p, 0, 255 * sizeof(int));\n"
" if(a)\n"
" return p;\n"
" return NULL; \n"
"}\n");
ASSERT_EQUALS("[test.cpp:7]: (error) Memory leak: p\n", errout.str());
}
void allocfunc1() void allocfunc1()
{ {
check("static char *a()\n" check("static char *a()\n"