UninitVar: Fixed false positive when checking if allocated pointer is null

danmar · danmar · commit 26dfddac6bbf · 2013-12-24T12:48:17.000+01:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -1812,7 +1812,7 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, bool all
         return (var && var->typeStartToken()->isStandardType());
     }
 
-    if (vartok->next() && vartok->next()->isOp() && !vartok->next()->isAssignmentOp())
+    if (!alloc && vartok->next() && vartok->next()->isOp() && !vartok->next()->isAssignmentOp())
         return true;
 
     if (vartok->strAt(1) == "]")
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -3342,6 +3342,12 @@ class TestUninitVar : public TestFixture {
                         "}\n");
         ASSERT_EQUALS("", errout.str());
 
+        checkUninitVar2("void f() {\n"
+                        "    char *p = malloc(100);\n"
+                        "    p || assert_failed();\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout.str());
+
         // function parameter (treat it as initialized until malloc is used)
         checkUninitVar2("int f(int *p) {\n"
                         "    if (*p == 1) {}\n" // no error

Original file line number	Diff line number	Diff line change
`@@ -1812,7 +1812,7 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, bool all`
`1812`	`1812`	`return (var && var->typeStartToken()->isStandardType());`
`1813`	`1813`	`}`
`1814`	`1814`
`1815`		`- if (vartok->next() && vartok->next()->isOp() && !vartok->next()->isAssignmentOp())`
	`1815`	`+ if (!alloc && vartok->next() && vartok->next()->isOp() && !vartok->next()->isAssignmentOp())`
`1816`	`1816`	`return true;`
`1817`	`1817`
`1818`	`1818`	`if (vartok->strAt(1) == "]")`