From 5bebeec224417194f6d1ac1bf0e2581c8deba6f5 Mon Sep 17 00:00:00 2001
From: Paul Fultz II <pfultz2@yahoo.com>
Date: Sun, 23 Sep 2018 23:37:47 -0500
Subject: [PATCH] Fix issue 8775: Dont follow aliased variables (#1390)

---
 lib/astutils.cpp   | 13 +++++++++++++
 test/testother.cpp |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index 50aa92f71..a86bd11c4 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -158,6 +158,15 @@ static bool precedes(const Token * tok1, const Token * tok2)
     return tok1->progressValue() < tok2->progressValue();
 }
 
+static bool isAliased(const Token * startTok, const Token * endTok, unsigned int varid)
+{
+    for (const Token *tok = startTok; tok != endTok; tok = tok->next()) {
+        if (Token::Match(tok, "= & %varid% ;", varid))
+            return true;
+    }
+    return false;
+}
+
 /// This takes a token that refers to a variable and it will return the token
 /// to the expression that the variable is assigned to. If its not valid to
 /// make such substitution then it will return the original token.
@@ -197,6 +206,8 @@ static const Token * followVariableExpression(const Token * tok, bool cpp, const
     const Token * endToken = (isInLoopCondition(tok) || isInLoopCondition(varTok) || var->scope() != tok->scope()) ? var->scope()->bodyEnd : lastTok;
     if (!var->isConst() && (!precedes(varTok, endToken) || isVariableChanged(varTok, endToken, tok->varId(), false, nullptr, cpp)))
         return tok;
+    if (precedes(varTok, endToken) && isAliased(varTok, endToken, tok->varId()))
+        return tok;
     // Start at beginning of initialization
     const Token * startToken = varTok;
     while (Token::Match(startToken, "%op%|.|(|{") && startToken->astOperand1())
@@ -223,6 +234,8 @@ static const Token * followVariableExpression(const Token * tok, bool cpp, const
                 return tok;
             if (!var2->isConst() && (!precedes(tok2, endToken2) || isVariableChanged(tok2, endToken2, tok2->varId(), false, nullptr, cpp)))
                 return tok;
+            if (precedes(tok2, endToken2) && isAliased(tok2, endToken2, tok2->varId()))
+                return tok;
             // Recognized as a variable but the declaration is unknown
         } else if (tok2->varId() > 0) {
             return tok;
diff --git a/test/testother.cpp b/test/testother.cpp
index f1ab0f182..61cdbcc52 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -4080,6 +4080,15 @@ private:
         check("volatile const int var = 42;\n"
               "void f() { if(var == 42) {} }\n");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f() {\n"
+              "    int a = 0;\n"
+              "    struct b c;\n"
+              "    c.a = &a;\n"
+              "    g(&c);\n"
+              "    if (a == 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void duplicateExpressionLoop() {