Fixed cppcheck-opensource#6769 (false positive: Uninitialized struct member: epoch.integer)

danmar · danmar · commit d93cf96a295e · 2015-11-22T16:20:46.000+01:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -1050,7 +1050,12 @@ bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::str
             return true;
     } else if (tok->strAt(1) == "=")
         return true;
-    else if (tok->strAt(-1) == "&") {
+    else if (Token::Match(tok, "%var% . %name% (")) {
+        const Token *ftok = tok->tokAt(2);
+        if (!ftok->function() || !ftok->function()->isConst())
+            // TODO: Try to determine if membervar is assigned in method
+            return true;
+    } else if (tok->strAt(-1) == "&") {
         if (Token::Match(tok->tokAt(-2), "[(,] & %name%")) {
             // locate start parentheses in function call..
             unsigned int argumentNumber = 0;
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -3101,13 +3101,15 @@ class TestUninitVar : public TestFixture {
         ASSERT_EQUALS("", errout.str());
 
         {
-            checkUninitVar("void f(void) {\n"
+            checkUninitVar("struct AB { char a[10]; };\n"
+                           "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy(ab.a, STR);\n"
                            "}\n", "test.c");
             ASSERT_EQUALS("", errout.str());
 
-            checkUninitVar("void f(void) {\n"
+            checkUninitVar("struct AB { char a[10]; };\n"
+                           "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy(x, ab.a);\n"
                            "}\n", "test.c");
@@ -3130,6 +3132,33 @@ class TestUninitVar : public TestFixture {
                        "}\n", "test.c");
         ASSERT_EQUALS("", errout.str());
 
+        {
+            // #6769 - calling method that might assign struct members
+            checkUninitVar("struct AB { int a; int b; void set(); };\n"
+                           "void f(void) {\n"
+                           "    struct AB ab;\n"
+                           "    ab.set();\n"
+                           "    x = ab;\n"
+                           "}\n");
+            ASSERT_EQUALS("", errout.str());
+
+            checkUninitVar("struct AB { int a; int get() const; };\n"
+                           "void f(void) {\n"
+                           "    struct AB ab;\n"
+                           "    ab.get();\n"
+                           "    x = ab;\n"
+                           "}\n");
+            ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized struct member: ab.a\n", errout.str());
+
+            checkUninitVar("struct AB { int a; void dostuff() {} };\n"
+                           "void f(void) {\n"
+                           "    struct AB ab;\n"
+                           "    ab.dostuff();\n"
+                           "    x = ab;\n"
+                           "}\n");
+            TODO_ASSERT_EQUALS("error", "", errout.str());
+        }
+
         checkUninitVar("struct AB { int a; struct { int b; int c; } s; };\n"
                        "void do_something(const struct AB ab);\n"
                        "void f(void) {\n"
