Merge branch 'master' of https://github.com/danmar/cppcheck

orbitcowboy · orbitcowboy · commit a7ded1e19fd7 · 2015-01-22T06:53:23.000+01:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -1495,9 +1495,12 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,
                     *alloc = true;
                 continue;
             }
-            if (var.isPointer() && (_tokenizer->isC() || var.typeStartToken()->isStandardType() || (var.type() && var.type()->needInitialization == Type::True)) && Token::Match(tok->next(), "= new")) {
-                if (alloc)
+            if (var.isPointer() && (var.typeStartToken()->isStandardType() || (var.type() && var.type()->needInitialization == Type::True)) && Token::Match(tok->next(), "= new")) {
+                if (alloc) {
                     *alloc = true;
+                    if (var.typeScope()->numConstructors > 0)
+                        return false;
+                }
                 continue;
             }
 
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -1455,21 +1455,28 @@ class TestUninitVar : public TestFixture {
                         "{\n"
                         "    Fred *fred = new Fred;\n"
                         "    fred->foo();\n"
-                        "};");
+                        "}");
+        ASSERT_EQUALS("", errout.str());
+
+        checkUninitVarB("struct Fred { int i; Fred(int, float); };\n"
+                        "void f() {\n"
+                        "    Fred *fred = new Fred(1, 2);\n"
+                        "    fred->foo();\n"
+                        "}");
         ASSERT_EQUALS("", errout.str());
 
         checkUninitVarB("void f()\n"
                         "{\n"
                         "    Fred *fred = malloc(sizeof(Fred));\n"
                         "    x(&fred->f);\n"
-                        "};");
+                        "}");
         ASSERT_EQUALS("", errout.str());
 
         checkUninitVarB("void f()\n"
                         "{\n"
                         "    Fred *fred = malloc(sizeof(Fred));\n"
                         "    x(fred->f);\n"
-                        "};");
+                        "}");
         ASSERT_EQUALS("", errout.str());
 
         checkUninitVarB("void foo(char *s)\n"

Original file line number	Diff line number	Diff line change
`@@ -1495,9 +1495,12 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,`
`1495`	`1495`	`*alloc = true;`
`1496`	`1496`	`continue;`
`1497`	`1497`	`}`
`1498`		`- if (var.isPointer() && (_tokenizer->isC() \|\| var.typeStartToken()->isStandardType() \|\| (var.type() && var.type()->needInitialization == Type::True)) && Token::Match(tok->next(), "= new")) {`
`1499`		`- if (alloc)`
	`1498`	`+ if (var.isPointer() && (var.typeStartToken()->isStandardType() \|\| (var.type() && var.type()->needInitialization == Type::True)) && Token::Match(tok->next(), "= new")) {`
	`1499`	`+ if (alloc) {`
`1500`	`1500`	`*alloc = true;`
	`1501`	`+ if (var.typeScope()->numConstructors > 0)`
	`1502`	`+ return false;`
	`1503`	`+ }`
`1501`	`1504`	`continue;`
`1502`	`1505`	`}`
`1503`	`1506`