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

memory leaks: improved the simplification of 'if* ;'

This commit is contained in:
Daniel Marjamäki 2009-08-29 16:27:16 +02:00
parent 8f1f89ae2b
commit 270d2b2d4f
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/checkmemoryleak.cpp
View File

@ -1201,8 +1201,8 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
done = false; done = false;
} }
// Reduce "if ; else return use ;" => "if return use ;" // Reduce "if ; else" => "if"
else if (Token::simpleMatch(tok2->next(), "if ; else return use ;")) else if (Token::simpleMatch(tok2->next(), "if ; else"))
{ {
Token::eraseTokens(tok2->next(), tok2->tokAt(4)); Token::eraseTokens(tok2->next(), tok2->tokAt(4));
done = false; done = false;
@ -1277,10 +1277,26 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
done = false; done = false;
} }
// Reduce "if* ;" that is not followed by an else.. // Reduce "if* ;"..
if (Token::Match(tok2->next(), "if(var)|if(!var)|ifv ; !!else")) if (Token::Match(tok2->next(), "if(var)|if(!var)|ifv ;"))
{ {
Token::eraseTokens(tok2, tok2->tokAt(2)); // Followed by else..
if (Token::simpleMatch(tok2->tokAt(3), "else"))
{
tok2 = tok2->next();
if (tok2->str() == "if(var)")
tok2->str("if(!var)");
else if (tok2->str() == "if(!var)")
tok2->str("if(var)");
// remove the "; else"
Token::eraseTokens(tok2, tok2->tokAt(3));
}
else
{
// remove the "if* ;"
Token::eraseTokens(tok2, tok2->tokAt(3));
}
done = false; done = false;
} }

6
test/testmemleak.cpp
View File

@ -437,6 +437,12 @@ private:
ASSERT_EQUALS("; alloc ;", simplifycode("; if { alloc; } else { return; }")); ASSERT_EQUALS("; alloc ;", simplifycode("; if { alloc; } else { return; }"));
ASSERT_EQUALS("; alloc ; dealloc ;", simplifycode("; alloc ; if(!var) { alloc ; } dealloc ;")); ASSERT_EQUALS("; alloc ; dealloc ;", simplifycode("; alloc ; if(!var) { alloc ; } dealloc ;"));
// "if ; .."
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 ;"));
ASSERT_EQUALS("; ifv xxx ;", simplifycode("; ifv ; else xxx ;"));
{ {
const char code[] = "; alloc ; if { dealloc ; return ; }"; const char code[] = "; alloc ; if { dealloc ; return ; }";
ASSERT_EQUALS(code, simplifycode(code)); ASSERT_EQUALS(code, simplifycode(code));