Skip to content

Fix integer overflow in ImmutableArray range validation #124042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eiriktsarpalis merged 5 commits into from
Feb 9, 2026
+17 −4
Merged

Fix integer overflow in ImmutableArray range validation #124042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
587a930
Fix integer overflow in ImmutableArray range validation
prozolic Feb 5, 2026
a8e4350
Add a test case for ImmutableArray<T>.Slice.
prozolic Feb 5, 2026
eb41ea6
Merge branch 'main' into immutablearraycreate
prozolic Feb 5, 2026
217bd05
Fix overflow in range validation using subtraction
prozolic Feb 8, 2026
f79abc1
Merge branch 'immutablearraycreate' of https://github.com/prozolic/ru…
prozolic Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public static ImmutableArray<T> Create<T>(T[] items, int start, int length)
{
Requires.NotNull(items, nameof(items));
Requires.Range(start >= 0 && start <= items.Length, nameof(start));
Requires.Range(length >= 0 && start + length <= items.Length, nameof(length));
Requires.Range(length >= 0 && length <= items.Length - start, nameof(length));

if (length == 0)
{
Expand All @@ -243,7 +243,7 @@ public static ImmutableArray<T> Create<T>(T[] items, int start, int length)
public static ImmutableArray<T> Create<T>(ImmutableArray<T> items, int start, int length)
{
Requires.Range(start >= 0 && start <= items.Length, nameof(start));
Requires.Range(length >= 0 && start + length <= items.Length, nameof(length));
Requires.Range(length >= 0 && length <= items.Length - start, nameof(length));

if (length == 0)
{
Expand Down Expand Up @@ -307,7 +307,7 @@ public static ImmutableArray<TResult> CreateRange<TSource, TResult>(ImmutableArr
int itemsLength = items.Length;

Requires.Range(start >= 0 && start <= itemsLength, nameof(start));
Requires.Range(length >= 0 && start + length <= itemsLength, nameof(length));
Requires.Range(length >= 0 && length <= itemsLength - start, nameof(length));
Requires.NotNull(selector, nameof(selector));

if (length == 0)
Expand Down Expand Up @@ -379,7 +379,7 @@ public static ImmutableArray<TResult> CreateRange<TSource, TArg, TResult>(Immuta
int itemsLength = items.Length;

Requires.Range(start >= 0 && start <= itemsLength, nameof(start));
Requires.Range(length >= 0 && start + length <= itemsLength, nameof(length));
Requires.Range(length >= 0 && length <= itemsLength - start, nameof(length));
Requires.NotNull(selector, nameof(selector));

if (length == 0)
Expand Down
13 changes: 13 additions & 0 deletions src/libraries/System.Collections.Immutable/tests/ImmutableArrayTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,11 @@ public void CreateRangeSliceWithSelectorInvalid(IEnumerable<int> source)
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.CreateRange(array, Math.Max(0, array.Length - 1), 2, i => i));
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.CreateRange(array, 0, -1, i => i));

if (array.Length > 0)
{
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.CreateRange(array, 1, int.MaxValue, i => i));
}

Assert.Throws<NullReferenceException>(() => ImmutableArray.CreateRange(s_emptyDefault, 0, 0, i => i));
}

Expand Down Expand Up @@ -387,6 +392,11 @@ public void CreateRangeSliceWithSelectorAndArgumentInvalid(IEnumerable<int> sour
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.CreateRange(array, Math.Max(0, array.Length - 1), 2, (i, j) => i + j, 0));
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.CreateRange(array, 0, -1, (i, j) => i + j, 0));

if (array.Length > 0)
{
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.CreateRange(array, 1, int.MaxValue, (i, j) => i + j, 0));
}

Assert.Throws<NullReferenceException>(() => ImmutableArray.CreateRange(s_emptyDefault, 0, 0, (x, y) => 0, 0));
}

Expand Down Expand Up @@ -432,6 +442,7 @@ public void CreateFromSliceOfImmutableArrayInvalid(IEnumerable<int> source)
if (array.Length > 0)
{
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.Create(array, 1, array.Length));
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.Create(array, 1, int.MaxValue));
}
}

Expand Down Expand Up @@ -478,6 +489,7 @@ public void CreateFromSliceOfArrayInvalid(IEnumerable<int> source)
if (array.Length > 0)
{
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.Create(array, 1, array.Length));
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => ImmutableArray.Create(array, 1, int.MaxValue));
}
}

Expand All @@ -497,6 +509,7 @@ public void SliceFromInvalidRange(IEnumerable<int> source)
if (array.Length > 0)
{
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => array.Slice(1, array.Length));
AssertExtensions.Throws<ArgumentOutOfRangeException>("length", () => array.Slice(1, int.MaxValue));
}
}

Expand Down
Loading