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

Ticket #7745: Simplify "alloc ; dealloc ;" blocks that we don't have any value for CheckMemoryLeak's analysis. (#860) 

Add an optional extended description…
This commit is contained in:
Simon Martin 2017-01-15 22:14:37 +01:00 committed by PKEuS
parent 982991fabe
commit c82d8a0d06
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkmemoryleak.cpp
View File

@ -1696,6 +1696,13 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok) const
done = false; done = false;
} }
// Ticket #7745
// Delete "if (!var) { alloc ; dealloc }" blocks
if (Token::simpleMatch(tok2->next(), "if(!var) { alloc ; dealloc ; }")) {
tok2->deleteNext(7);
done = false;
}
// Reduce "do { alloc ; } " => "alloc ;" // Reduce "do { alloc ; } " => "alloc ;"
/** @todo If the loop "do { alloc ; }" can be executed twice, reduce it to "loop alloc ;" */ /** @todo If the loop "do { alloc ; }" can be executed twice, reduce it to "loop alloc ;" */
if (Token::simpleMatch(tok2->next(), "do { alloc ; }")) { if (Token::simpleMatch(tok2->next(), "do { alloc ; }")) {

11
test/testmemleak.cpp
View File

@ -184,6 +184,7 @@ private:
TEST_CASE(if9); // if (realloc) TEST_CASE(if9); // if (realloc)
TEST_CASE(if10); // else if (realloc) TEST_CASE(if10); // else if (realloc)
TEST_CASE(if11); TEST_CASE(if11);
TEST_CASE(if12); // Ticket #7745
TEST_CASE(forwhile5); TEST_CASE(forwhile5);
TEST_CASE(forwhile6); TEST_CASE(forwhile6);
@ -1232,6 +1233,16 @@ private:
"", errout.str()); "", errout.str());
} }
void if12() { // #7745
check("void f() {\n"
" FILE *fp = fopen(\"name\", \"r\");\n"
" if (!fp) {\n"
" fp = fopen(\"name\", \"w\");\n"
" fclose(fp);\n"
" }\n"
"}", /*c=*/true, /*posix=*/false);
ASSERT_EQUALS("[test.c:7]: (error) Resource leak: fp\n", errout.str());
}
void forwhile5() { void forwhile5() {
check("void f(const char **a)\n" check("void f(const char **a)\n"