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

Memory leaks: Detect simple leak

This commit is contained in:
Daniel Marjamäki 2009-10-27 23:08:11 +01:00
parent fad29ca205
commit 0682db47a7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkmemoryleak.cpp
View File

@ -1716,7 +1716,7 @@ const Token *CheckMemoryLeakInFunction::findleak(const Token *tokens, bool all)
return result;
}
if ((result = Token::findmatch(tokens, "alloc ; if return ;")) != NULL)
if ((result = Token::findmatch(tokens, "alloc ; if|if(var)|ifv return ;")) != NULL)
{
return result->tokAt(3);
}

10
test/testmemleak.cpp
View File

@ -532,7 +532,12 @@ private:
// replace "if ( ! var )" => "if(!var)"
for (Token *tok = tokenizer._tokens; tok; tok = tok->next())
{
if (Token::simpleMatch(tok, "if ( var )"))
if (tok->str() == "if_var")
{
tok->str("if(var)");
}
else if (Token::simpleMatch(tok, "if ( var )"))
{
Token::eraseTokens(tok, tok->tokAt(4));
tok->str("if(var)");
@ -566,8 +571,9 @@ private:
ASSERT_EQUALS(-1, dofindleak("if alloc;\n use;"));
// if..
ASSERT_EQUALS(-1, dofindleak("alloc; ifv { dealloc; }"));
ASSERT_EQUALS(-1, dofindleak("alloc; ifv dealloc;"));
ASSERT_EQUALS(2, dofindleak("alloc;\n if return;\n dealloc;"));
ASSERT_EQUALS(2, dofindleak("alloc;\n if_var return;\n dealloc;"));
ASSERT_EQUALS(3, dofindleak("alloc;\n if\n return;\n dealloc;"));
ASSERT_EQUALS(-1, dofindleak("alloc; if { dealloc ; return; } dealloc;"));
ASSERT_EQUALS(-1, dofindleak("alloc; if { dealloc ; return; } dealloc;"));