From f947955c6348f9a24d1a48357f18a5dd6f97ec38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sat, 22 Jan 2011 13:40:19 +0100
Subject: [PATCH] Fixed #2492 (False positive: memory leak 'return
 &self->foo;')

---
 lib/checkmemoryleak.cpp |  3 ++-
 test/testmemleak.cpp    | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 72e58f20c..dcb203360 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -3101,7 +3101,8 @@ void CheckMemoryLeakStructMember::check()
                         else if (tok3->str() == "return")
                         {
                             // Returning from function without deallocating struct member?
-                            if (!Token::Match(tok3, "return %varid% ;", structid))
+                            if (!Token::Match(tok3, "return %varid% ;", structid) &&
+                                !Token::Match(tok3, "return & %varid% .", structid))
                             {
                                 memoryLeak(tok3, (vartok->str() + "." + tok2->strAt(2)).c_str(), Malloc);
                             }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 36978ff79..4cebd567f 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -4206,7 +4206,8 @@ private:
         TEST_CASE(goto_);
 
         // Don't report errors if the struct is returned
-        TEST_CASE(ret);
+        TEST_CASE(ret1);
+        TEST_CASE(ret2);
 
         // assignments
         TEST_CASE(assign);
@@ -4284,7 +4285,7 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
-    void ret()
+    void ret1()
     {
         check("static ABC * foo()\n"
               "{\n"
@@ -4301,6 +4302,17 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
+    void ret2()
+    {
+        check("static ABC * foo()\n"
+              "{\n"
+              "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
+              "    abc->a = malloc(10);\n"
+              "    return &abc->self;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void assign()
     {
         check("static void foo()\n"