Memory leaks: Detect simple leak

Daniel Marjamäki · Daniel Marjamäki · commit 0682db47a7fc · 2009-10-27T23:08:11.000+01:00
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -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);
     }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
@@ -532,7 +532,12 @@ class TestMemleakInFunction : public TestFixture
         // 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 @@ class TestMemleakInFunction : public TestFixture
         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;"));

Original file line number	Diff line number	Diff line change
`@@ -1716,7 +1716,7 @@ const Token CheckMemoryLeakInFunction::findleak(const Token tokens, bool all)`
`1716`	`1716`	`return result;`
`1717`	`1717`	`}`
`1718`	`1718`
`1719`		`- if ((result = Token::findmatch(tokens, "alloc ; if return ;")) != NULL)`
	`1719`	`+ if ((result = Token::findmatch(tokens, "alloc ; if\|if(var)\|ifv return ;")) != NULL)`
`1720`	`1720`	`{`
`1721`	`1721`	`return result->tokAt(3);`
`1722`	`1722`	`}`