From 1b4b4ee43e8387f5eae8a08d81b3fe9a7d894708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sun, 29 May 2011 17:44:10 +0200
Subject: [PATCH] Fixed #2806 (False positive with g_strstrip())

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

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 4a5664047..f6fbdd87c 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1090,7 +1090,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
                             break;
                         }
 
-                        if (Token::Match(tok2, "[=+] %varid%", varid))
+                        if (Token::Match(tok2, "[=+(,] %varid%", varid))
                         {
                             rhs = true;
                         }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index aa6f6920c..c603aca93 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -263,7 +263,8 @@ private:
         TEST_CASE(realloc10);
         TEST_CASE(realloc11);
 
-        TEST_CASE(assign);
+        TEST_CASE(assign1);
+        TEST_CASE(assign2);   // #2806 - FP when using redundant assignment
 
         TEST_CASE(varid);
 
@@ -2705,7 +2706,7 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
-    void assign()
+    void assign1()
     {
         check("void foo()\n"
               "{\n"
@@ -2761,6 +2762,17 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
+    void assign2()
+    {
+        // #2806 - FP when there is redundant assignment
+        check("void foo() {\n"
+              "   gchar *bar;\n"
+              "   bar = g_strdup(fuba);\n"
+              "   bar = g_strstrip(bar);\n"
+              "   g_free(bar);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
 
     void varid()
     {