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

memory leaks: fixed todo testcases to find more memory leaks

This commit is contained in:
Daniel Marjamäki 2009-09-01 20:02:28 +02:00
parent ca053bf8f9
commit 9a47b7110e
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/checkmemoryleak.cpp
View File

@ -1222,8 +1222,8 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
done = false; done = false;
} }
// Delete first if in .. "if { dealloc|assign|use ; return ; } if return ;" // Delete "if { dealloc|assign|use ; return ; }"
else if (Token::Match(tok2, "[;{}] if { dealloc|assign|use ; return ; } if return ;")) else if (Token::Match(tok2, "[;{}] if { dealloc|assign|use ; return ; }"))
{ {
Token::eraseTokens(tok2, tok2->tokAt(8)); Token::eraseTokens(tok2, tok2->tokAt(8));
done = false; done = false;

20
test/testmemleak.cpp
View File

@ -452,15 +452,7 @@ private:
ASSERT_EQUALS("; if(var) xxx ;", simplifycode("; if(!var) ; else xxx ;")); ASSERT_EQUALS("; if(var) xxx ;", simplifycode("; if(!var) ; else xxx ;"));
ASSERT_EQUALS("; if(!var) xxx ;", simplifycode("; if(var) ; else xxx ;")); ASSERT_EQUALS("; if(!var) xxx ;", simplifycode("; if(var) ; else xxx ;"));
ASSERT_EQUALS("; ifv xxx ;", simplifycode("; ifv ; else xxx ;")); ASSERT_EQUALS("; ifv xxx ;", simplifycode("; ifv ; else xxx ;"));
ASSERT_EQUALS("; alloc ;", simplifycode("; alloc; if { dealloc; return; }"));
{
const char code1[] = "; alloc ; if { dealloc ; return ; }";
ASSERT_EQUALS(code1, simplifycode(code1));
ASSERT_EQUALS("; alloc ;", simplifycode(code1, true));
const char code2[] = "; alloc ; if { dealloc ; return ; } else { return ; }";
ASSERT_EQUALS("; alloc ; if return ;", simplifycode(code2));
}
// switch.. // switch..
@ -471,8 +463,6 @@ private:
ASSERT_EQUALS("; loop alloc ;", simplifycode("; loop { alloc ; }")); ASSERT_EQUALS("; loop alloc ;", simplifycode("; loop { alloc ; }"));
ASSERT_EQUALS("; alloc ; alloc ;", simplifycode("; alloc ; do { alloc ; } loop ;")); ASSERT_EQUALS("; alloc ; alloc ;", simplifycode("; alloc ; do { alloc ; } loop ;"));
// return..
// callfunc.. // callfunc..
ASSERT_EQUALS("; callfunc ;", simplifycode(";callfunc;", false)); ASSERT_EQUALS("; callfunc ;", simplifycode(";callfunc;", false));
ASSERT_EQUALS(";", simplifycode(";callfunc;", true)); ASSERT_EQUALS(";", simplifycode(";callfunc;", true));
@ -485,17 +475,9 @@ private:
TODO_ASSERT_EQUALS(";", simplifycode("; alloc ; ifv { exit; }", false)); TODO_ASSERT_EQUALS(";", simplifycode("; alloc ; ifv { exit; }", false));
TODO_ASSERT_EQUALS("; alloc ;", simplifycode("; alloc ; ifv { exit; }", true)); TODO_ASSERT_EQUALS("; alloc ;", simplifycode("; alloc ; ifv { exit; }", true));
ASSERT_EQUALS("; alloc ; if { dealloc ; return ; }", simplifycode("; alloc; if { dealloc; return; }"));
TODO_ASSERT_EQUALS("; alloc ;", simplifycode("; alloc; if { dealloc; return; }"));
ASSERT_EQUALS("; alloc ; if return ; return ;", simplifycode(";alloc;if{return;}return;")); ASSERT_EQUALS("; alloc ; if return ; return ;", simplifycode(";alloc;if{return;}return;"));
TODO_ASSERT_EQUALS("; alloc ; return ;", simplifycode(";alloc;if{return;}return;")); TODO_ASSERT_EQUALS("; alloc ; return ;", simplifycode(";alloc;if{return;}return;"));
{
const char code[] = "; alloc ; if { dealloc ; return ; } dealloc ;";
ASSERT_EQUALS(code, simplifycode(code));
TODO_ASSERT_EQUALS("; alloc ; dealloc ;", simplifycode(code));
}
} }