Fixed cppcheck-opensource#4394 (FP: Variable 'a' is not assigned a value)

danmar · danmar · commit bce99a9e2f68 · 2013-02-20T17:43:16.000+01:00
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -427,9 +427,13 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
         }
         tok = tok->next();
 
-        if (Token::Match(tok, "&| %var%") ||
-            Token::Match(tok, "( const| struct|union| %type% *| ) &| %var%") ||
-            Token::Match(tok, "( const| struct|union| %type% *| ) ( &| %var%") ||
+        if (Token::Match(tok, "( const| struct|union| %type% * ) ( ("))
+            tok = tok->link()->next();
+
+        if (Token::Match(tok, "( [(<] const| struct|union| %type% *| [>)]"))
+            tok = tok->next();
+
+        if (Token::Match(tok, "(| &| %var%") ||
             Token::Match(tok->next(), "< const| struct|union| %type% *| > ( &| %var%")) {
             bool addressOf = false;
 
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
@@ -103,6 +103,7 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvaralias9); // ticket #1996
         TEST_CASE(localvaralias10); // ticket #2004
         TEST_CASE(localvaralias11); // ticket #4423 - iterator
+        TEST_CASE(localvaralias12); // ticket #4394
         TEST_CASE(localvarasm);
         TEST_CASE(localvarstatic);
         TEST_CASE(localvarextern);
@@ -2727,6 +2728,15 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
+    void localvaralias12() { // #4394
+        functionVariableUsage("void f(void) {\n"
+                              "    int a[4];\n"
+                              "    int *b = (int*)((int*)a+1);\n"
+                              "    x(b);\n"
+                              "}");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void localvarasm() {
         functionVariableUsage("void foo(int &b)\n"
                               "{\n"
