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

memory leaks: better handling of loops and switch

This commit is contained in:
Daniel Marjamäki 2010-01-10 15:40:50 +01:00
parent f65bf6d565
commit a50ec2eded
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/checkmemoryleak.cpp
View File

@ -1528,10 +1528,10 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
done = false;
}
// Reduce "{ loop ;" => ";"
if (Token::Match(tok2, "{ loop ;"))
// Reduce "loop|do ;" => ";"
if (Token::Match(tok2, "loop|do ;"))
{
tok2->deleteNext();
tok2->deleteThis();
done = false;
}
@ -1693,9 +1693,6 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
break;
}
else if (strncmp(_tok->str().c_str(), "if", 2) == 0)
break;
else if (_tok->str() == "switch")
break;
@ -1708,6 +1705,9 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
else if (Token::Match(_tok, "return !!;"))
break;
if (Token::Match(_tok, "if return|break use| ;"))
_tok = _tok->tokAt(2);
incase |= (_tok->str() == "case");
incase &= (_tok->str() != "break" && _tok->str() != "return");
}
@ -1737,8 +1737,17 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all)
tok2->insertToken("else");
tok2 = tok2->next();
}
while (tok2 && tok2->str() != "}" && ! Token::Match(tok2, "break|return ;"))
tok2 = tok2->next();
while (tok2)
{
if (tok2->str() == "}")
break;
if (Token::Match(tok2, "break|return ;"))
break;
if (Token::Match(tok2, "if return|break use| ;"))
tok2 = tok2->tokAt(2);
else
tok2 = tok2->next();
}
if (Token::simpleMatch(tok2, "break ;"))
{
tok2->str(";");

2
test/testmemleak.cpp
View File

@ -593,10 +593,12 @@ private:
// switch..
ASSERT_EQUALS("; alloc ; dealloc ;", simplifycode(";alloc;switch{case;break;};dealloc;"));
ASSERT_EQUALS("; if return ; }", simplifycode("; switch { case ; return ; default ; break ; } }"));
ASSERT_EQUALS("; if return ; }", simplifycode("; switch { case ; if { return ; } break ; default ; break ; } }"));
ASSERT_EQUALS("; if return ; else use ; }", simplifycode("; switch { case ; return ; default ; use ; break ; } }"));
ASSERT_EQUALS("; use ; }", simplifycode("; while1 { loop { ; } switch { case ; dealloc ; return ; default ; break ; } } }"));
// loops..
ASSERT_EQUALS(";", simplifycode("; loop { ; }"));
ASSERT_EQUALS(";", simplifycode("; loop { break; }"));
ASSERT_EQUALS(";", simplifycode("; loop { if { break; } }"));
ASSERT_EQUALS("; loop alloc ;", simplifycode("; loop { alloc ; }"));