Fixed false positive in CheckUninitVar and internal message

PKEuS · PKEuS · commit c3e47f7eaa03 · 2015-01-21T22:26:44.000+01:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -1438,7 +1438,7 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,
         }
 
         // bailout on ternary operator. TODO: This can be solved much better. For example, if the variable is not accessed in the branches of the ternary operator, we could just continue.
-        if (Token::Match(tok, "?")) {
+        if (tok->str() == "?") {
             return true;
         }
 
@@ -1706,6 +1706,12 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, bool all
                 assignment = true;
                 break;
             }
+            if (alloc && parent->str() == "(") {
+                if (_settings->library.functionpure.find(parent->strAt(-1)) == _settings->library.functionpure.end()) {
+                    assignment = true;
+                    break;
+                }
+            }
             parent = parent->astParent();
         }
         if (!assignment)
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -1470,7 +1470,7 @@ class TestUninitVar : public TestFixture {
                         "    Fred *fred = malloc(sizeof(Fred));\n"
                         "    x(fred->f);\n"
                         "};");
-        TODO_ASSERT_EQUALS("", "[test.cpp:4]: (error) Memory is allocated but not initialized: fred\n", errout.str());
+        ASSERT_EQUALS("", errout.str());
 
         checkUninitVarB("void foo(char *s)\n"
                         "{\n"

Original file line number	Diff line number	Diff line change
`@@ -1438,7 +1438,7 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,`
`1438`	`1438`	`}`
`1439`	`1439`
`1440`	`1440`	`// bailout on ternary operator. TODO: This can be solved much better. For example, if the variable is not accessed in the branches of the ternary operator, we could just continue.`
`1441`		`- if (Token::Match(tok, "?")) {`
	`1441`	`+ if (tok->str() == "?") {`
`1442`	`1442`	`return true;`
`1443`	`1443`	`}`
`1444`	`1444`
`@@ -1706,6 +1706,12 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, bool all`
`1706`	`1706`	`assignment = true;`
`1707`	`1707`	`break;`
`1708`	`1708`	`}`
	`1709`	`+ if (alloc && parent->str() == "(") {`
	`1710`	`+ if (_settings->library.functionpure.find(parent->strAt(-1)) == _settings->library.functionpure.end()) {`
	`1711`	`+ assignment = true;`
	`1712`	`+ break;`
	`1713`	`+ }`
	`1714`	`+ }`
`1709`	`1715`	`parent = parent->astParent();`
`1710`	`1716`	`}`
`1711`	`1717`	`if (!assignment)`