Before linking vars check is parent var must be checked.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/analysis/expression.cpp b/src/analysis/expression.cpp
index c607e9e..e907792 100644
--- a/src/analysis/expression.cpp
+++ b/src/analysis/expression.cpp
@@ -124,8 +124,11 @@ void analyseModifyExpr(ModifyExprNode *node, const WalkItem &wi, WalkItem &wo)
             std::string var2 = getVariableName(node->args[1]);
             if (!var1.empty() && !var2.empty())
             {
-                wo.addNullVars.insert(var1);
-                addLinkedVar(wo, var2, var1);
+                if (wi.checkNullVars.find(var2) != wi.checkNullVars.end())
+                {
+                    wo.addNullVars.insert(var1);
+                    addLinkedVar(wo, var2, var1);
+                }
             }
         }
     }
@@ -564,6 +567,8 @@ void analyseInitExpr(InitExprNode* node,
     std::string var2 = getVariableName(node->args[1]);
     if (var1.empty() || var2.empty())
         return;
+    if (wi.checkNullVars.find(var2) == wi.checkNullVars.end())
+        return;
     wo.addNullVars.insert(var1);
     addLinkedVar(wo, var2, var1);
 }