Uninitialized variables: Fix FP for struct array

danmar · danmar · commit 305760f14337 · 2015-09-16T14:42:55.000+02:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -849,7 +849,7 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc al
             return true;
     } else if (alloc != NO_ALLOC && Token::Match(vartok, "%var% [")) {
         const Token *parent = vartok->next()->astParent();
-        while (Token::simpleMatch(parent, "["))
+        while (Token::Match(parent, "[|."))
             parent = parent->astParent();
         if (Token::simpleMatch(parent, "&") && !parent->astOperand2())
             return false;
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -1435,6 +1435,15 @@ class TestUninitVar : public TestFixture {
                        "  bar(x);\n"
                        "}");
         ASSERT_EQUALS("", errout.str());
+
+        // struct
+        checkUninitVar("struct Fred { int x; int y; };\n"
+                       ""
+                       "void f() {\n"
+                       "  struct Fred fred[10];\n"
+                       "  fred[1].x = 0;\n"
+                       "}", "test.c");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void uninitvar_pointertoarray() {
