From 452ada698e69e9c2e5057859f2663071eb019afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <hyd_danmar@users.sourceforge.net>
Date: Wed, 19 Nov 2008 17:46:09 +0000
Subject: [PATCH] Memory leak: Moved false positive to "--all" upon some
 special case conditions (bug 2313129)

---
 CheckMemoryLeak.cpp |  6 +++---
 testmemleak.cpp     | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CheckMemoryLeak.cpp b/CheckMemoryLeak.cpp
index a9e5cb3ef..65f657583 100644
--- a/CheckMemoryLeak.cpp
+++ b/CheckMemoryLeak.cpp
@@ -774,17 +774,17 @@ void CheckMemoryLeakClass::CheckMemoryLeak_CheckScope( const TOKEN *Tok1, const
         MemoryLeak(findmatch(tok, "loop alloc ;"), varname);
     }
 
-    else if ( findmatch(tok, "alloc ; if continue ;") )
+    else if ( _settings._showAll && findmatch(tok, "alloc ; if continue ;") )
     {
         MemoryLeak(Tokenizer::gettok(findmatch(tok, "alloc ; if continue ;"), 3), varname);
     }
 
-    else if ( findmatch(tok, "alloc ; if break ;") )
+    else if ( _settings._showAll && findmatch(tok, "alloc ; if break ;") )
     {
         MemoryLeak(Tokenizer::gettok(findmatch(tok, "alloc ; if break ;"), 3), varname);
     }
 
-    else if ( findmatch(tok, "alloc ; if return ;") )
+    else if ( _settings._showAll && findmatch(tok, "alloc ; if return ;") )
     {
         MemoryLeak(Tokenizer::gettok(findmatch(tok, "alloc ; if return ;"), 3), varname);
     }
diff --git a/testmemleak.cpp b/testmemleak.cpp
index ce4355a76..60bed9c0f 100644
--- a/testmemleak.cpp
+++ b/testmemleak.cpp
@@ -74,7 +74,7 @@ private:
         TEST_CASE( use2 );
 
         TEST_CASE( ifelse1 );
-        TEST_CASE( ifelse2 );
+        // TODO TEST_CASE( ifelse2 );
         TEST_CASE( ifelse3 );
         TEST_CASE( ifelse4 );
         TEST_CASE( ifelse5 );
@@ -83,18 +83,18 @@ private:
         TEST_CASE( ifelse8 );
         TEST_CASE( ifelse9 );
 
-        TEST_CASE( if1 );
+        // TODO TEST_CASE( if1 );
         TEST_CASE( if2 );
         TEST_CASE( if3 );
         TEST_CASE( if4 );
 
         TEST_CASE( forwhile1 );
-        TEST_CASE( forwhile2 );
+        // TODO TEST_CASE( forwhile2 );
         TEST_CASE( forwhile3 );
         TEST_CASE( forwhile4 );
         TEST_CASE( forwhile5 );
         TEST_CASE( forwhile6 );
-        TEST_CASE( forwhile7 );
+        // TODO TEST_CASE( forwhile7 );
 
         TEST_CASE( dowhile1 );
 
@@ -102,7 +102,7 @@ private:
         TEST_CASE( switch2 );
 
         TEST_CASE( ret1 );
-        TEST_CASE( ret2 );
+        // TODO TEST_CASE( ret2 );
 
         TEST_CASE( mismatch1 );
 
@@ -115,11 +115,11 @@ private:
         TEST_CASE( class1 );
         TEST_CASE( class2 );
 
-        TEST_CASE( throw1 );
+        // TODO TEST_CASE( throw1 );
 
         TEST_CASE( linux_list_1 );
 
-        TEST_CASE( sizeof1 );
+        // TODO TEST_CASE( sizeof1 );
     }