Skip to content

[release/6.0] [mono] Fix downcast check in Array.CopySlow #64479

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
merged 2 commits into from
Feb 7, 2022
Merged

[release/6.0] [mono] Fix downcast check in Array.CopySlow #64479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64dfb25
Add regression test for object[] -> Int32Enum[] array copy
lambdageek Jan 28, 2022
5ff36f3
Fix downcast check in slow array copy
lambdageek Jan 28, 2022
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
3 changes: 3 additions & 0 deletions src/libraries/System.Runtime/tests/System/ArrayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,6 +1275,9 @@ public static IEnumerable<object[]> Copy_SZArray_UnreliableConversion_CanPerform

// Interface[] -> Class[]
yield return new object[] { new NonGenericInterface1[10], 0, new NonGenericClass1[10], 0, 10, new NonGenericClass1[10] };

// object[] -> Int32Enum[] when values are all Int32Enum
yield return new object[] { new object[] { Int32Enum.Case3 }, 0, new Int32Enum[1], 0, 1, new Int32Enum[] { Int32Enum.Case3 } };
}

public static IEnumerable<object[]> Copy_Array_UnreliableConversion_CanPerform_TestData()
Expand Down
6 changes: 2 additions & 4 deletions src/mono/System.Private.CoreLib/src/System/Array.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ private static void Copy(Array sourceArray, int sourceIndex, Array destinationAr

Type src_type = sourceArray.GetType().GetElementType()!;
Type dst_type = destinationArray.GetType().GetElementType()!;
Type dst_elem_type = dst_type;
bool dst_type_vt = dst_type.IsValueType && Nullable.GetUnderlyingType(dst_type) == null;

bool src_is_enum = src_type.IsEnum;
Expand Down Expand Up @@ -196,12 +197,9 @@ private static void Copy(Array sourceArray, int sourceIndex, Array destinationAr
{
object srcval = sourceArray.GetValueImpl(source_pos + i);

if (!src_type.IsValueType && dst_is_enum)
if (dst_type_vt && (srcval == null || (src_type == typeof(object) && !dst_elem_type.IsAssignableFrom (srcval.GetType()))))
throw new InvalidCastException(SR.InvalidCast_DownCastArrayElement);

if (dst_type_vt && (srcval == null || (src_type == typeof(object) && srcval.GetType() != dst_type)))
throw new InvalidCastException();

try
{
destinationArray.SetValueRelaxedImpl(srcval, dest_pos + i);
Expand Down