From d22da6088c46ac360e931ea93485d208774a1dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Mon, 21 Jun 2010 18:43:28 +0200
Subject: [PATCH] Fixed #1800 (false positive: memory leak when ptr used as map
 key)

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

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 883831dc8..ed7b264e8 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1282,7 +1282,8 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
                 Token::Match(tok, "%var% + %varid%", varid) ||
                 Token::Match(tok, "%varid% +=|-=", varid) ||
                 Token::Match(tok, "+=|<< %varid% ;", varid) ||
-                Token::Match(tok, "= strcpy|strcat|memmove|memcpy ( %varid% ,", varid))
+                Token::Match(tok, "= strcpy|strcat|memmove|memcpy ( %varid% ,", varid) ||
+                Token::Match(tok, "[;{}] %var% [ %varid% ]", varid))
             {
                 addtoken("use");
             }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index e8c3d84ad..fc7b3acae 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -499,6 +499,7 @@ private:
         ASSERT_EQUALS(";;use;", getcode("char *s; s2 = s + 10;", "s"));
         ASSERT_EQUALS(";;use;", getcode("char *s; s2 = x + s;", "s"));
         ASSERT_EQUALS(";;use;if{;}", getcode("char *s; if (foo(s)) ;", "s"));
+        ASSERT_EQUALS(";;use;", getcode("char *s; map1[s] = 0;", "s"));
 
         // return..
         ASSERT_EQUALS(";;return;", getcode("char *s; return;", "s"));