Check op limits on Variant arrays and TranslateBrowsePathsToNodeIds (#…

…1788)
OPCFoundation · May 5, 2022 · ae9bf1b · ae9bf1b
1 parent 586a63c
commit ae9bf1b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Libraries/Opc.Ua.Server/Server/StandardServer.cs b/Libraries/Opc.Ua.Server/Server/StandardServer.cs
@@ -991,6 +991,11 @@ public override ResponseHeader UnregisterNodes(RequestHeader requestHeader, Node
             {
                 ValidateOperationLimits(browsePaths, OperationLimits.MaxNodesPerTranslateBrowsePathsToNodeIds);
 
+                foreach (BrowsePath bp in browsePaths)
+                {
+                    ValidateOperationLimits(bp.RelativePath.Elements.Count, OperationLimits.MaxNodesPerTranslateBrowsePathsToNodeIds);
+                }
+
                 m_serverInternal.NodeManager.TranslateBrowsePathsToNodeIds(
                     context,
                     browsePaths,

diff --git a/Stack/Opc.Ua.Core/Types/Encoders/BinaryDecoder.cs b/Stack/Opc.Ua.Core/Types/Encoders/BinaryDecoder.cs
@@ -1522,6 +1522,15 @@ public object ReadArray(string fieldName, int valueRank, BuiltInType builtInType
                         }
                         length *= dimensions[ii];
                     }
+                    if (length > m_context.MaxArrayLength)
+                    {
+                        throw ServiceResultException.Create(
+                            StatusCodes.BadEncodingLimitsExceeded,
+                            "Maximum array length of {0} was exceeded while summing up to {1} from the array dimensions",
+                            m_context.MaxArrayLength,
+                            length
+                            );
+                    }
                     // read the elements
                     Array elements = null;
                     if (encodeableTypeId != null)
@@ -2151,7 +2160,7 @@ private Variant ReadVariantValue(string fieldName)
             if ((encodingByte & (byte)VariantArrayEncodingBits.Array) != 0)
             {
                 // read the array length.
-                int length = m_reader.ReadInt32();
+                int length = ReadArrayLength();
 
                 if (length < 0)
                 {