Fixed danmar#2635 (False positive: resource leak)

Author: Daniel Marjamäki

lib/checkmemoryleak.cpp

@@ -1964,8 +1964,8 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok)
                 }
                 else
                 {
-                    // remove the "if* ;"
-                    Token::eraseTokens(tok2, tok2->tokAt(3));
+                    // remove the "if*"
+                    Token::eraseTokens(tok2, tok2->tokAt(2));
                 }
                 done = false;
             }

test/testmemleak.cpp

@@ -727,6 +727,10 @@ class TestMemleakInFunction : public TestFixture
 
         // use ; dealloc ;
         ASSERT_EQUALS("; alloc ; use ; if return ; dealloc ;", simplifycode("; alloc ; use ; if { return ; } dealloc ;"));
+
+        // #2635 - false negative
+        ASSERT_EQUALS("; alloc ; return use ; }",
+                      simplifycode("; alloc ; if(!var) { loop { ifv { } } alloc ; } return use; }"));
     }