1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #75357 from Redwarx008/fix-Godot.Collections.Array.AddRange-index-out-of-bounds

Browse Source 
C#: Fix `Array.AddRange` index out of bounds
This commit is contained in:
Yuri Sizov 2023-03-30 18:37:37 +02:00 committed by GitHub
commit dbf1a7277f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
View File

@ -554,6 +554,7 @@ namespace Godot.Collections
// instead of growing it as we add items. // instead of growing it as we add items.
if (collection.TryGetNonEnumeratedCount(out int count)) if (collection.TryGetNonEnumeratedCount(out int count))
{ {
int oldCount = Count;
Resize(Count + count); Resize(Count + count);
using var enumerator = collection.GetEnumerator(); using var enumerator = collection.GetEnumerator();
@ -561,7 +562,7 @@ namespace Godot.Collections
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
enumerator.MoveNext(); enumerator.MoveNext();
this[count + i] = Variant.From(enumerator.Current); this[oldCount + i] = Variant.From(enumerator.Current);
} }
return; return;
@ -1578,6 +1579,7 @@ namespace Godot.Collections
// instead of growing it as we add items. // instead of growing it as we add items.
if (collection.TryGetNonEnumeratedCount(out int count)) if (collection.TryGetNonEnumeratedCount(out int count))
{ {
int oldCount = Count;
Resize(Count + count); Resize(Count + count);
using var enumerator = collection.GetEnumerator(); using var enumerator = collection.GetEnumerator();
@ -1585,7 +1587,7 @@ namespace Godot.Collections
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
enumerator.MoveNext(); enumerator.MoveNext();
this[count + i] = enumerator.Current; this[oldCount + i] = enumerator.Current;
} }
return; return;