C#: Fix Array.AddRange index out of bounds

Fix Array.AddRange index out of bounds
YuriSizov · Mar 27, 2023 · eb1fb25 · eb1fb25
1 parent 6ef2f35
commit eb1fb25
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
@@ -554,14 +554,15 @@ public void AddRange<[MustBeVariant] T>(IEnumerable<T> collection)
             // instead of growing it as we add items.
             if (collection.TryGetNonEnumeratedCount(out int count))
             {
+                int oldCount = Count;
                 Resize(Count + count);
 
                 using var enumerator = collection.GetEnumerator();
 
                 for (int i = 0; i < count; i++)
                 {
                     enumerator.MoveNext();
-                    this[count + i] = Variant.From(enumerator.Current);
+                    this[oldCount + i] = Variant.From(enumerator.Current);
                 }
 
                 return;
@@ -1578,14 +1579,15 @@ public void AddRange(IEnumerable<T> collection)
             // instead of growing it as we add items.
             if (collection.TryGetNonEnumeratedCount(out int count))
             {
+                int oldCount = Count;
                 Resize(Count + count);
 
                 using var enumerator = collection.GetEnumerator();
 
                 for (int i = 0; i < count; i++)
                 {
                     enumerator.MoveNext();
-                    this[count + i] = enumerator.Current;
+                    this[oldCount + i] = enumerator.Current;
                 }
 
                 return;