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

Fixed #2285 (False Positive: memory leak)

This commit is contained in:
Daniel Marjamäki 2010-12-08 21:02:02 +01:00
parent bc30c7d23b
commit cad9c5f232
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkmemoryleak.cpp
View File

@ -1847,10 +1847,10 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok)
} }
// Reduce "while1 continue| ;" => "use ;" // Reduce "while1 continue| ;" => "use ;"
if (Token::Match(tok2, "while1 continue| ;")) if (Token::Match(tok2, "while1 if| continue| ;"))
{ {
tok2->str("use"); tok2->str("use");
if (tok2->strAt(1) == "continue") while (tok2->strAt(1) != ";")
tok2->deleteNext(); tok2->deleteNext();
done = false; done = false;
} }

2
test/testmemleak.cpp
View File

@ -668,6 +668,8 @@ private:
ASSERT_EQUALS(";", simplifycode("; loop { if { continue ; } else { if continue ; } }")); ASSERT_EQUALS(";", simplifycode("; loop { if { continue ; } else { if continue ; } }"));
ASSERT_EQUALS(";", simplifycode("; loop { { if continue ; if continue ; } }")); ASSERT_EQUALS(";", simplifycode("; loop { { if continue ; if continue ; } }"));
ASSERT_EQUALS(";", simplifycode("; while1 { if { dealloc ; return ; } if { if { continue ; } } }"));
// scope.. // scope..
// current result - ok // current result - ok
ASSERT_EQUALS("; assign ; dealloc ; if alloc ; }", simplifycode("; assign ; { dealloc ; if alloc ; } }")); ASSERT_EQUALS("; assign ; dealloc ; if alloc ; }", simplifycode("; assign ; { dealloc ; if alloc ; } }"));