fix fuzzing error

OPCFoundation · Jan 16, 2025 · 536567d · 536567d
1 parent 6d2af00
commit 536567d
Showing 1 changed file with 42 additions and 39 deletions.
diff --git a/Stack/Opc.Ua.Core/Types/BuiltIn/NodeId.cs b/Stack/Opc.Ua.Core/Types/BuiltIn/NodeId.cs
@@ -312,15 +312,15 @@ public static NodeId Parse(IServiceMessageContext context, string text, NodeIdPa
 
                 if (index < 0)
                 {
-                    throw new ServiceResultException(StatusCodes.BadNodeIdInvalid, $"Invalid NodeId ({originalText}).");
+                    throw ServiceResultException.Create(StatusCodes.BadNodeIdInvalid, "Invalid NodeId ({0}).", originalText);
                 }
 
                 var namespaceUri = Utils.UnescapeUri(text.Substring(4, index - 4));
                 namespaceIndex = (options?.UpdateTables == true) ? context.NamespaceUris.GetIndexOrAppend(namespaceUri) : context.NamespaceUris.GetIndex(namespaceUri);
 
                 if (namespaceIndex < 0)
                 {
-                    throw new ServiceResultException(StatusCodes.BadNodeIdInvalid, $"No mapping to NamespaceIndex for NamespaceUri ({namespaceUri}).");
+                    throw ServiceResultException.Create(StatusCodes.BadNodeIdInvalid, "No mapping to NamespaceIndex for NamespaceUri ({0}).", namespaceUri);
                 }
 
                 text = text.Substring(index + 1);
@@ -332,7 +332,7 @@ public static NodeId Parse(IServiceMessageContext context, string text, NodeIdPa
 
                 if (index < 0)
                 {
-                    throw new ServiceResultException(StatusCodes.BadNodeIdInvalid, $"Invalid ExpandedNodeId ({originalText}).");
+                    throw ServiceResultException.Create(StatusCodes.BadNodeIdInvalid, "Invalid ExpandedNodeId ({0}).", originalText);
                 }
 
                 if (UInt16.TryParse(text.Substring(3, index - 3), out ushort ns))
@@ -348,58 +348,61 @@ public static NodeId Parse(IServiceMessageContext context, string text, NodeIdPa
                 text = text.Substring(index + 1);
             }
 
-            var idType = text.Substring(0, 1);
-            text = text.Substring(2);
-
-            switch (idType)
+            if (text.Length >= 2)
             {
-                case "i":
-                {
-                    if (UInt32.TryParse(text, out uint number))
-                    {
-                        return new NodeId(number, (ushort)namespaceIndex);
-                    }
+                char idType = text[0];
+                text = text.Substring(2);
 
-                    break;
-                }
-
-                case "s":
+                switch (idType)
                 {
-                    if (!String.IsNullOrWhiteSpace(text))
+                    case 'i':
                     {
-                        return new NodeId(text, (ushort)namespaceIndex);
-                    }
+                        if (UInt32.TryParse(text, out uint number))
+                        {
+                            return new NodeId(number, (ushort)namespaceIndex);
+                        }
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "b":
-                {
-                    try
+                    case 's':
                     {
-                        var bytes = Convert.FromBase64String(text);
-                        return new NodeId(bytes, (ushort)namespaceIndex);
+                        if (!String.IsNullOrWhiteSpace(text))
+                        {
+                            return new NodeId(text, (ushort)namespaceIndex);
+                        }
+
+                        break;
                     }
-                    catch (Exception)
+
+                    case 'b':
                     {
-                        // error handled after the switch statement.
-                    }
+                        try
+                        {
+                            var bytes = Convert.FromBase64String(text);
+                            return new NodeId(bytes, (ushort)namespaceIndex);
+                        }
+                        catch (Exception)
+                        {
+                            // error handled after the switch statement.
+                        }
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "g":
-                {
-                    if (Guid.TryParse(text, out var guid))
+                    case 'g':
                     {
-                        return new NodeId(guid, (ushort)namespaceIndex);
-                    }
+                        if (Guid.TryParse(text, out var guid))
+                        {
+                            return new NodeId(guid, (ushort)namespaceIndex);
+                        }
 
-                    break;
+                        break;
+                    }
                 }
             }
 
-            throw new ServiceResultException(StatusCodes.BadNodeIdInvalid, $"Invalid NodeId Identifier ({originalText}).");
+            throw ServiceResultException.Create(StatusCodes.BadNodeIdInvalid, "Invalid NodeId Identifier ({0}).", originalText);
         }
 
         /// <summary>