From e987d2e05bf797d52caa93e8a10da1f84cac1c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sun, 13 Jun 2010 19:00:11 +0200
Subject: [PATCH] Memory leaks: more specific bailouts to reduce false
 negatives

---
 lib/checkmemoryleak.cpp | 13 ++++++++++---
 test/testmemleak.cpp    | 28 +++++++++-------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 0c54f7ef8..2bd846a51 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -2389,9 +2389,6 @@ void CheckMemoryLeakInClass::parseClass(const Token *tok1, std::vector<std::stri
 
 void CheckMemoryLeakInClass::variable(const std::string &classname, const Token *tokVarname)
 {
-    if (!_settings->inconclusive)
-        return;
-
     const std::string varname = tokVarname->strAt(0);
 
     // Check if member variable has been allocated and deallocated..
@@ -2434,6 +2431,16 @@ void CheckMemoryLeakInClass::variable(const std::string &classname, const Token
                 // Allocate..
                 if (indent == 0 || Token::Match(tok, (varname + " =").c_str()))
                 {
+                    // var1 = var2 = ...
+                    // bail out
+                    if (Token::simpleMatch(tok->previous(), "="))
+                        return;
+
+                    // Foo::var1 = ..
+                    // bail out
+                    if (Token::simpleMatch(tok->previous(), "::"))
+                        return;
+
                     AllocType alloc = getAllocationType(tok->tokAt((indent > 0) ? 2 : 3), 0);
                     if (alloc != CheckMemoryLeak::No)
                     {
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 0cdb45f0b..fa3a5e222 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -2886,8 +2886,7 @@ private:
               "{\n"
               "    delete [] str2;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: Fred::str1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: Fred::str1\n", errout.str());
     }
 
 
@@ -2911,9 +2910,7 @@ private:
               "{\n"
               "    free(str1);\n"
               "}\n");
-
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:17]: (error) Mismatching allocation and deallocation: Fred::str1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:17]: (error) Mismatching allocation and deallocation: Fred::str1\n", errout.str());
     }
 
     void class3()
@@ -3060,8 +3057,7 @@ private:
               "    int * p;\n"
               "    A() { p = new int; }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: A::p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: A::p\n", errout.str());
     }
 
     void class11()
@@ -3074,8 +3070,7 @@ private:
               "};\n"
               "A::A() : p(new int[10])\n"
               "{ }");
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: A::p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: A::p\n", errout.str());
     }
 
     void class12()
@@ -3098,8 +3093,7 @@ private:
               "\n"
               "void A::cleanup()\n"
               "{ delete [] p; }\n");
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: A::p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: A::p\n", errout.str());
     }
 
     void class13()
@@ -3136,8 +3130,7 @@ private:
               "\n"
               "void A::init()\n"
               "{ p = new int[10]; }\n");
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: A::p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: A::p\n", errout.str());
 
         check("class A\n"
               "{\n"
@@ -3148,8 +3141,7 @@ private:
               "\n"
               "void A::init()\n"
               "{ p = new int; }\n");
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: A::p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: A::p\n", errout.str());
 
         check("class A\n"
               "{\n"
@@ -3160,8 +3152,7 @@ private:
               "\n"
               "void A::init()\n"
               "{ p = malloc(sizeof(int)*10); }\n");
-        ASSERT_EQUALS("", errout.str());
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: A::p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: A::p\n", errout.str());
     }
 
     void class15()
@@ -3331,8 +3322,7 @@ private:
               "A::~A() {\n"
               "    delete [] pkt_buffer;\n"
               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:14]: (error) Mismatching allocation and deallocation: A::pkt_buffer\n", errout.str());
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:14]: (error) Mismatching allocation and deallocation: A::pkt_buffer\n", errout.str());
     }
 
     void func1()