QNTM-5426: Adding null checks to harden return from CreateNodeFromShortName (#9269)

ColinDayOrg · web-flow · commit e2fca14630a8 · 2018-11-28T08:35:24.000-05:00
* Update changes from librarie.js to fix QNTM-3710

* Add null checks on the first two levels of function calling

* Next layer of null checks

* Undo changes to AssemblySharedInfo.cs

* Switch to use IsNullOrEmpty
diff --git a/src/DynamoCore/Engine/NodeToCode/NodeToCode.cs b/src/DynamoCore/Engine/NodeToCode/NodeToCode.cs
@@ -244,6 +244,9 @@ public override bool VisitIdentifierNode(IdentifierNode node)
 
         public override bool VisitIdentifierListNode(IdentifierListNode node)
         {
+            if (node == null)
+                return false;
+
             if (node.LeftNode is IdentifierNode || node.LeftNode is IdentifierListNode)
             {
                 if (node.RightNode is FunctionCallNode || node.RightNode is IdentifierNode)
@@ -319,6 +322,9 @@ public ShortestQualifiedNameReplacer(ClassTable classTable, ElementResolver reso
 
         public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
         {
+            if (node == null)
+                return null;
+
             // First pass attempt to resolve the node class name 
             // and shorten it before traversing it deeper
             AssociativeNode shortNameNode;
@@ -471,6 +477,9 @@ public override bool VisitGroupExpressionNode(GroupExpressionNode node)
 
         public override bool VisitIdentifierListNode(IdentifierListNode node)
         {
+            if (node == null)
+                return false;
+
             if (forDefinition)
                 return false;
 
@@ -479,6 +488,9 @@ public override bool VisitIdentifierListNode(IdentifierListNode node)
 
         public override bool VisitFunctionCallNode(FunctionCallNode node)
         {
+            if (node == null)
+                return false;
+
             if (forDefinition)
                 return false;
 
diff --git a/src/DynamoCore/Graph/Nodes/CodeBlockNode.cs b/src/DynamoCore/Graph/Nodes/CodeBlockNode.cs
@@ -1136,6 +1136,9 @@ public override AssociativeNode VisitIdentifierNode(IdentifierNode node)
 
             public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
             {
+                if (node == null)
+                    return null;
+
                 node.LeftNode = node.LeftNode.Accept(this);
 
                 var rightNode = node.RightNode;
diff --git a/src/Engine/ProtoCore/MigrationRewriter.cs b/src/Engine/ProtoCore/MigrationRewriter.cs
@@ -42,6 +42,9 @@ public static IEnumerable<Node> MigrateMethodNames(IEnumerable<Node> astNodes, I
 
         public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
         {
+            if (node == null)
+                return null;
+
             var leftNodeName = node.LeftNode.ToString();
             var rightNode = node.RightNode as FunctionCallNode;
             string rightNodeName = string.Empty;
@@ -60,6 +63,9 @@ public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
 
         public override AssociativeNode VisitFunctionCallNode(FunctionCallNode node)
         {
+            if (node == null)
+                return null;
+
             var functionName = node.Function.Name;
 
             string newNodeName;
@@ -79,6 +85,8 @@ private void OnLogWarning(string oldNodeName, string newNodeName)
         private IdentifierListNode GenerateNewIdentifierList(string newNodeName, FunctionCallNode funcCall)
         {
             var newNode = CoreUtils.CreateNodeFromString(newNodeName);
+            if (newNode == null)
+                return null;
 
             // append argument list from original method to newNode
             var newMethodName = ((IdentifierListNode)newNode).RightNode.Name;
diff --git a/src/Engine/ProtoCore/Namespace/ElementRewriter.cs b/src/Engine/ProtoCore/Namespace/ElementRewriter.cs
@@ -64,6 +64,8 @@ public override AssociativeNode VisitTypedIdentifierNode(TypedIdentifierNode nod
                 return node;
 
             var identListNode = CoreUtils.CreateNodeFromString(node.TypeAlias);
+            if (identListNode == null)
+                return null;
 
             // Rewrite node with resolved name
             if (identListNode is IdentifierNode)
@@ -95,6 +97,9 @@ public override AssociativeNode VisitTypedIdentifierNode(TypedIdentifierNode nod
 
         public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
         {
+            if (node == null)
+                return null;
+
             // If node is a reserved method call, skip rewriting it.
             if (ReservedMethods.Any(reservedMethod => node.ToString().Contains(reservedMethod)))
             {
@@ -136,6 +141,8 @@ private bool IsMatchingResolvedName(IdentifierListNode identifierList, out Assoc
                 return false;
 
             newIdentList = CoreUtils.CreateNodeFromString(resolvedName);
+            if (newIdentList == null)
+                return false;
             
             var symbol = new Symbol(resolvedName);
             return symbol.Matches(identifierList.ToString());
@@ -183,6 +190,8 @@ private AssociativeNode RewriteIdentifierListNode(AssociativeNode identifierList
             var identListNode = identifierList as IdentifierListNode;
 
             var newIdentList = CoreUtils.CreateNodeFromString(resolvedName);
+            if (newIdentList == null)
+                return null;
 
             // If the original input node matches with the resolved name, simply return 
             // the identifier list constructed from the resolved name
diff --git a/src/Engine/ProtoCore/SyntaxAnalysis/AssociativeAstVisitor.cs b/src/Engine/ProtoCore/SyntaxAnalysis/AssociativeAstVisitor.cs
@@ -97,6 +97,9 @@ public virtual bool VisitNullNode(NullNode node)
 
         public virtual bool VisitFunctionCallNode(FunctionCallNode node)
         {
+            if (node == null)
+                return false;
+
             for (int i = 0; i < node.FormalArguments.Count; ++i)
             {
                 node.FormalArguments[i].Accept(this);
@@ -457,6 +460,9 @@ public override AssociativeNode VisitGroupExpressionNode(GroupExpressionNode nod
 
         public override AssociativeNode VisitIdentifierNode(IdentifierNode node)
         {
+            if (node == null)
+                return null;
+
             if (node.ArrayDimensions != null)
             {
                 var newArrayDimensions = node.ArrayDimensions.Accept(this);
@@ -474,6 +480,9 @@ public override AssociativeNode VisitTypedIdentifierNode(TypedIdentifierNode nod
 
         public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
         {
+            if (node == null)
+                return null;
+
             var newLeftNode = node.LeftNode.Accept(this);
             if (newLeftNode != node.LeftNode)
                 node.LeftNode = newLeftNode;
@@ -487,6 +496,9 @@ public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
 
         public override AssociativeNode VisitFunctionCallNode(FunctionCallNode node)
         {
+            if (node == null)
+                return null;
+
             var func = node.Function.Accept(this);
             if (node.Function != func)
                 node.Function = func;
diff --git a/src/Engine/ProtoCore/SyntaxAnalysis/AstVisitor.cs b/src/Engine/ProtoCore/SyntaxAnalysis/AstVisitor.cs
@@ -383,6 +383,9 @@ public override AssociativeNode VisitGroupExpressionNode(GroupExpressionNode nod
 
         public override AssociativeNode VisitIdentifierNode(IdentifierNode node)
         {
+            if (node == null)
+                return null;
+
             if (node.ArrayDimensions != null)
             {
                 var newArrayDimensions = node.ArrayDimensions.Accept(this);
@@ -400,6 +403,9 @@ public override AssociativeNode VisitTypedIdentifierNode(TypedIdentifierNode nod
 
         public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
         {
+            if (node == null)
+                return null;
+
             var newLeftNode = node.LeftNode.Accept(this);
             if (newLeftNode != node.LeftNode)
                 node.LeftNode = newLeftNode;
@@ -413,6 +419,9 @@ public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)
 
         public override AssociativeNode VisitFunctionCallNode(FunctionCallNode node)
         {
+            if (node == null)
+                return null;
+
             var func = node.Function.Accept(this);
             if (node.Function != func)
                 node.Function = func;
diff --git a/src/Engine/ProtoCore/Utils/CompilerUtils.cs b/src/Engine/ProtoCore/Utils/CompilerUtils.cs
@@ -561,6 +561,9 @@ public override bool VisitIdentifierNode(IdentifierNode node)
 
             public override bool VisitIdentifierListNode(IdentifierListNode node)
             {
+                if (node == null)
+                    return false;
+
                 if (node.LeftNode is IdentifierNode || node.LeftNode is IdentifierListNode)
                 {
                     if (node.RightNode is FunctionCallNode || node.RightNode is IdentifierNode)
diff --git a/src/Engine/ProtoCore/Utils/CoreUtils.cs b/src/Engine/ProtoCore/Utils/CoreUtils.cs
@@ -670,6 +670,9 @@ public static string GetAssemblyFromClassName(ClassTable classTable, string clas
         /// <returns></returns>
         public static AssociativeNode CreateNodeFromString(string name)
         {
+            if (string.IsNullOrEmpty(name))
+                return null;
+
             string[] strIdentList = name.Split('.');
 
             if (strIdentList.Length == 1)

Original file line number	Diff line number	Diff line change
`@@ -1136,6 +1136,9 @@ public override AssociativeNode VisitIdentifierNode(IdentifierNode node)`
`1136`	`1136`
`1137`	`1137`	`public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)`
`1138`	`1138`	`{`
	`1139`	`+ if (node == null)`
	`1140`	`+ return null;`
	`1141`	`+`
`1139`	`1142`	`node.LeftNode = node.LeftNode.Accept(this);`
`1140`	`1143`
`1141`	`1144`	`var rightNode = node.RightNode;`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,9 @@ public virtual bool VisitNullNode(NullNode node)`
`97`	`97`
`98`	`98`	`public virtual bool VisitFunctionCallNode(FunctionCallNode node)`
`99`	`99`	`{`
	`100`	`+ if (node == null)`
	`101`	`+ return false;`
	`102`	`+`
`100`	`103`	`for (int i = 0; i < node.FormalArguments.Count; ++i)`
`101`	`104`	`{`
`102`	`105`	`node.FormalArguments[i].Accept(this);`
`@@ -457,6 +460,9 @@ public override AssociativeNode VisitGroupExpressionNode(GroupExpressionNode nod`
`457`	`460`
`458`	`461`	`public override AssociativeNode VisitIdentifierNode(IdentifierNode node)`
`459`	`462`	`{`
	`463`	`+ if (node == null)`
	`464`	`+ return null;`
	`465`	`+`
`460`	`466`	`if (node.ArrayDimensions != null)`
`461`	`467`	`{`
`462`	`468`	`var newArrayDimensions = node.ArrayDimensions.Accept(this);`
`@@ -474,6 +480,9 @@ public override AssociativeNode VisitTypedIdentifierNode(TypedIdentifierNode nod`
`474`	`480`
`475`	`481`	`public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)`
`476`	`482`	`{`
	`483`	`+ if (node == null)`
	`484`	`+ return null;`
	`485`	`+`
`477`	`486`	`var newLeftNode = node.LeftNode.Accept(this);`
`478`	`487`	`if (newLeftNode != node.LeftNode)`
`479`	`488`	`node.LeftNode = newLeftNode;`
`@@ -487,6 +496,9 @@ public override AssociativeNode VisitIdentifierListNode(IdentifierListNode node)`
`487`	`496`
`488`	`497`	`public override AssociativeNode VisitFunctionCallNode(FunctionCallNode node)`
`489`	`498`	`{`
	`499`	`+ if (node == null)`
	`500`	`+ return null;`
	`501`	`+`
`490`	`502`	`var func = node.Function.Accept(this);`
`491`	`503`	`if (node.Function != func)`
`492`	`504`	`node.Function = func;`
Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,9 @@ public override bool VisitIdentifierNode(IdentifierNode node)`
`561`	`561`
`562`	`562`	`public override bool VisitIdentifierListNode(IdentifierListNode node)`
`563`	`563`	`{`
	`564`	`+ if (node == null)`
	`565`	`+ return false;`
	`566`	`+`
`564`	`567`	`if (node.LeftNode is IdentifierNode \|\| node.LeftNode is IdentifierListNode)`
`565`	`568`	`{`
`566`	`569`	`if (node.RightNode is FunctionCallNode \|\| node.RightNode is IdentifierNode)`
Original file line number	Diff line number	Diff line change
`@@ -670,6 +670,9 @@ public static string GetAssemblyFromClassName(ClassTable classTable, string clas`
`670`	`670`	`/// <returns></returns>`
`671`	`671`	`public static AssociativeNode CreateNodeFromString(string name)`
`672`	`672`	`{`
	`673`	`+ if (string.IsNullOrEmpty(name))`
	`674`	`+ return null;`
	`675`	`+`
`673`	`676`	`string[] strIdentList = name.Split('.');`
`674`	`677`
`675`	`678`	`if (strIdentList.Length == 1)`