From 2667e34a0736a410e1543dd7cc9a813f16f4b635 Mon Sep 17 00:00:00 2001
From: Robert Reif <reif@earthlink.net>
Date: Thu, 1 Sep 2011 18:30:49 -0400
Subject: [PATCH] fix again #3064 (false negative: returning address of stack
 variable)

---
 lib/checkautovariables.cpp | 2 +-
 test/testautovariables.cpp | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
index 0d844ab11..92ce30bcd 100644
--- a/lib/checkautovariables.cpp
+++ b/lib/checkautovariables.cpp
@@ -168,7 +168,7 @@ void CheckAutoVariables::autoVariables()
             else if (Token::Match(tok, "return & %var% ;") && tok->tokAt(2)->varId())
             {
                 const Variable * var1 = symbolDatabase->getVariableFromVarId(tok->tokAt(2)->varId());
-                if (var1 && var1->isArgument() && var1->typeStartToken() == var1->typeEndToken())
+                if (var1 && var1->isArgument())
                     errorReturnAddressOfFunctionParameter(tok, tok->strAt(2));
             }
             // Invalid pointer deallocation
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index f1a5ef264..43be884d0 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -574,6 +574,13 @@ private:
               "}\n");
 
         ASSERT_EQUALS("[test.cpp:3]: (error) Return the address of function parameter 'y'\n", errout.str());
+
+        check("int ** foo(int * y)\n"
+              "{\n"
+              "  return &y;\n"
+              "}\n");
+
+        ASSERT_EQUALS("[test.cpp:3]: (error) Return the address of function parameter 'y'\n", errout.str());
     }
 
 };