When deserialize length is 0, the return array should be Array.Empty<…

…T>().
MessagePack-CSharp · Sep 14, 2020 · f284088 · f284088
1 parent ebdb29c
commit f284088
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/CollectionFormatter.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/CollectionFormatter.cs
@@ -43,28 +43,30 @@ public T[] Deserialize(ref MessagePackReader reader, MessagePackSerializerOption
             {
                 return default;
             }
-            else
+
+            var len = reader.ReadArrayHeader();
+            if (len == 0)
             {
-                IMessagePackFormatter<T> formatter = options.Resolver.GetFormatterWithVerify<T>();
+                return Array.Empty<T>();
+            }
 
-                var len = reader.ReadArrayHeader();
-                var array = new T[len];
-                options.Security.DepthStep(ref reader);
-                try
-                {
-                    for (int i = 0; i < array.Length; i++)
-                    {
-                        reader.CancellationToken.ThrowIfCancellationRequested();
-                        array[i] = formatter.Deserialize(ref reader, options);
-                    }
-                }
-                finally
+            IMessagePackFormatter<T> formatter = options.Resolver.GetFormatterWithVerify<T>();
+            var array = new T[len];
+            options.Security.DepthStep(ref reader);
+            try
+            {
+                for (int i = 0; i < array.Length; i++)
                 {
-                    reader.Depth--;
+                    reader.CancellationToken.ThrowIfCancellationRequested();
+                    array[i] = formatter.Deserialize(ref reader, options);
                 }
-
-                return array;
             }
+            finally
+            {
+                reader.Depth--;
+            }
+
+            return array;
         }
     }