From 6d94c4f15e2814c4db8fb56d206b97c73826c6ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Wed, 4 Aug 2010 20:48:20 +0200
Subject: [PATCH] Memory leaks: don't translate 'return p[10];' to 'return use
 ;'

---
 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 4346b51b8..a8fbe2b9a 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1266,7 +1266,8 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
 
             else if (varid && Token::Match(tok, "return &| %varid%", varid))
             {
-                addtoken("use");
+                if (!Token::Match(tok, "return %var% ["))
+                    addtoken("use");
             }
 
             else if (varid && Token::Match(tok, "return strcpy|strncpy|memcpy ( %varid%", varid))
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index a940ceaaa..2b2c6180f 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -453,6 +453,7 @@ private:
 
         // alloc; return;
         ASSERT_EQUALS(";;alloc;return;", getcode("char *s = new char[100]; return 0;", "s"));
+        ASSERT_EQUALS(";;alloc;return;", getcode("char *s = new char[100]; return s[0];", "s"));
 
         // lock/unlock..
         ASSERT_EQUALS(";;alloc;", getcode("int a; __cppcheck_lock();", ""));