From 71117378ef6ee2b2ec3ca024848cffb9b4cf1bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sat, 6 Feb 2010 21:47:52 +0100
Subject: [PATCH] Fixed #1363 (false positive: memory leak)

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

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index f50d614e0..3958d1de8 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1122,6 +1122,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
         if (varid)
         {
             if (Token::Match(tok, "[)=] %varid% [+;)]", varid) ||
+                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))
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 58634963b..7b4f2a858 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -495,6 +495,7 @@ private:
         ASSERT_EQUALS(";;use;", getcode("char *s; abc.a(s);", "s"));
         ASSERT_EQUALS(";;use;", getcode("char *s; s2 = s;", "s"));
         ASSERT_EQUALS(";;use;", getcode("char *s; s2 = s + 10;", "s"));
+        ASSERT_EQUALS(";;use;", getcode("char *s; s2 = x + s;", "s"));
 
         // return..
         ASSERT_EQUALS(";;return;", getcode("char *s; return;", "s"));