Fixed cppcheck-opensource#4907 (False positive "uninitStructMember" on structs with unions)

danmar · danmar · commit ee14ea4fc277 · 2013-09-23T07:20:20.000+02:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -1101,11 +1101,22 @@ void CheckUninitVar::checkScope(const Scope* scope)
             for (std::size_t j = 0U; j < symbolDatabase->classAndStructScopes.size(); ++j) {
                 const Scope *scope2 = symbolDatabase->classAndStructScopes[j];
                 if (scope2->className == structname && scope2->numConstructors == 0U) {
+                    bool hasUnion = false;
+                    for (std::list<Scope*>::const_iterator childscope = scope2->nestedList.begin();
+                         childscope != scope2->nestedList.end();
+                         ++childscope) {
+                        if ((*childscope)->type == Scope::eUnion)
+                            hasUnion = true;
+                    }
+                    if (hasUnion)
+                        break;
+
                     for (std::list<Variable>::const_iterator it = scope2->varlist.begin(); it != scope2->varlist.end(); ++it) {
                         const Variable &var = *it;
                         if (!var.isArray())
                             checkScopeForVariable(scope, tok, *i, NULL, NULL, var.name());
                     }
+                    break;
                 }
             }
         }
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -2788,6 +2788,20 @@ class TestUninitVar : public TestFixture {
                         "}\n", "test.c");
         ASSERT_EQUALS("", errout.str());
 
+        checkUninitVar2("struct PIXEL {\n" // union in struct #4970
+                        "    union  {\n"
+                        "        struct { unsigned char red,green,blue,alpha; };\n"
+                        "        unsigned int color;\n"
+                        "    };\n"
+                        "};\n"
+                        "\n"
+                        "unsigned char f() {\n"
+                        "    struct PIXEL p1;\n"
+                        "    p1.color = 255;\n"
+                        "    return p1.red;\n"
+                        "}");
+        ASSERT_EQUALS("", errout.str());
+
         // return
         checkUninitVar2("struct AB { int a; int b; };\n"
                         "void f(void) {\n"

Original file line number	Diff line number	Diff line change
`@@ -1101,11 +1101,22 @@ void CheckUninitVar::checkScope(const Scope* scope)`
`1101`	`1101`	`for (std::size_t j = 0U; j < symbolDatabase->classAndStructScopes.size(); ++j) {`
`1102`	`1102`	`const Scope *scope2 = symbolDatabase->classAndStructScopes[j];`
`1103`	`1103`	`if (scope2->className == structname && scope2->numConstructors == 0U) {`
	`1104`	`+ bool hasUnion = false;`
	`1105`	`+ for (std::list<Scope*>::const_iterator childscope = scope2->nestedList.begin();`
	`1106`	`+ childscope != scope2->nestedList.end();`
	`1107`	`+ ++childscope) {`
	`1108`	`+ if ((*childscope)->type == Scope::eUnion)`
	`1109`	`+ hasUnion = true;`
	`1110`	`+ }`
	`1111`	`+ if (hasUnion)`
	`1112`	`+ break;`
	`1113`	`+`
`1104`	`1114`	`for (std::list<Variable>::const_iterator it = scope2->varlist.begin(); it != scope2->varlist.end(); ++it) {`
`1105`	`1115`	`const Variable &var = *it;`
`1106`	`1116`	`if (!var.isArray())`
`1107`	`1117`	`checkScopeForVariable(scope, tok, *i, NULL, NULL, var.name());`
`1108`	`1118`	`}`
	`1119`	`+ break;`
`1109`	`1120`	`}`
`1110`	`1121`	`}`
`1111`	`1122`	`}`