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

Fixed #1282 (False positive for a memory leak in a simple loop)

This commit is contained in:
Daniel Marjamäki 2010-01-19 19:08:03 +01:00
parent f49cc7f0ff
commit 85fcd4c9a9
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkmemoryleak.cpp
View File

@ -1448,6 +1448,13 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
continue;
}
// Reduce "alloc loop !var alloc ;" => "alloc ;"
if (Token::Match(tok2, "[;{}] alloc ; loop !var alloc ;"))
{
Token::eraseTokens(tok2, tok2->tokAt(5));
done = false;
}
// Reduce "if(var) dealloc ;" and "if(var) use ;" that is not followed by an else..
if (Token::Match(tok2, "[;{}] if(var) assign|dealloc|use ; !!else"))
{

8
test/testmemleak.cpp
View File

@ -555,6 +555,12 @@ private:
Token::eraseTokens(tok, tok->tokAt(5));
tok->str("if(!var)");
}
else if (Token::simpleMatch(tok, "! var"))
{
tok->deleteNext();
tok->str("!var");
}
}
Settings settings;
@ -635,6 +641,8 @@ private:
ASSERT_EQUALS("; alloc ; alloc ;", simplifycode("; alloc ; do { alloc ; } loop ;"));
ASSERT_EQUALS("; exit ;", simplifycode("; alloc ; do { } loop ; exit ;"));
ASSERT_EQUALS("; alloc ;", simplifycode("; alloc ; loop !var alloc ;"));
ASSERT_EQUALS("; alloc ; dealloc ; return ;", simplifycode("; alloc ; while1 { if { dealloc ; return ; } }"));
ASSERT_EQUALS("; alloc ; dealloc ; return ;", simplifycode("; alloc ; while1 { if { dealloc ; return ; } if { continue ; } }"));
ASSERT_EQUALS("; alloc ;", simplifycode("; alloc ; while1 { if { dealloc ; return ; } if { break ; } }"));