CheckUninitVar: don't rely on Tokenizer::simplifyKnownVar() to simplify references

danmar · danmar · commit ab38ab800eea · 2015-09-13T17:31:45.000+02:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -828,8 +828,14 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc al
         }
     }
 
-    if (alloc == NO_ALLOC && Token::Match(vartok->previous(), "= %name% ;|%cop%"))
-        return true;
+    if (alloc == NO_ALLOC && Token::Match(vartok->previous(), "= %name% ;|%cop%")) {
+        // taking reference?
+        const Token *prev = vartok->tokAt(-2);
+        while (Token::Match(prev, "%name%|*"))
+            prev = prev->previous();
+        if (!Token::Match(prev, "&"))
+            return true;
+    }
 
     bool unknown = false;
     if (pointer && CheckNullPointer::isPointerDeRef(vartok, unknown)) {
