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

Fixed #728 (False positive, resource leak, when released in a loop)

This commit is contained in:
Daniel Marjamäki 2009-09-27 21:49:07 +02:00
parent 342e71803f
commit a61abcbbc8
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/checkmemoryleak.cpp
View File

@ -863,6 +863,12 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
// Loops..
else if ((tok->str() == "for") || (tok->str() == "while"))
{
if (Token::simpleMatch(tok, "while ( true )"))
{
addtoken("while1");
tok = tok->next()->link();
continue;
}
addtoken("loop");
isloop = true;
}
@ -1320,6 +1326,13 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
done = false;
}
// Reduce "while1 ;" => "use ;"
if (Token::simpleMatch(tok2, "while1 ;"))
{
tok2->str("use");
done = false;
}
// Delete if block: "alloc; if return use ;"
if (Token::Match(tok2, "alloc ; if return use ; !!else"))
{

3
test/testmemleak.cpp
View File

@ -350,6 +350,7 @@ private:
ASSERT_EQUALS(";;loop{}", getcode("char *s; for (a;b;c) { }", "s"));
ASSERT_EQUALS(";;loop{alloc;}", getcode("char *s; for (a;b;c) { s=malloc(10); }", "s"));
ASSERT_EQUALS(";;do{}loop;", getcode("char *s; do { } while (a);", "s"));
ASSERT_EQUALS(";;while1{}", getcode("char *s; while(true) { }", "s"));
// asprintf..
ASSERT_EQUALS(";;alloc;", getcode("char *s; asprintf(&s, \"xyz\");", "s"));
@ -485,6 +486,8 @@ private:
ASSERT_EQUALS("; alloc ; alloc ;", simplifycode("; alloc ; do { alloc ; } loop ;"));
ASSERT_EQUALS("; exit ;", simplifycode("; alloc ; do { } loop ; exit ;"));
ASSERT_EQUALS("; alloc ; use ;", simplifycode("; alloc ; while1 { if { dealloc ; return ; } }"));
// callfunc..
ASSERT_EQUALS("; callfunc ;\n;", simplifycode(";callfunc;"));