From 0682db47a7fc57320a6942653cda263aef1fcc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 27 Oct 2009 23:08:11 +0100 Subject: [PATCH] Memory leaks: Detect simple leak --- lib/checkmemoryleak.cpp | 2 +- test/testmemleak.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp index 8ae58787c..1e1d38b1a 100644 --- 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 index f6c18d13f..ec51011b4 100644 --- a/test/testmemleak.cpp +++ b/test/testmemleak.cpp @@ -532,7 +532,12 @@ private: // 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 @@ private: 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;"));