Skip to content

Commit

Permalink
Use shared strings for Array:Copy exception messages (dotnet#63163)
Browse files Browse the repository at this point in the history
  • Loading branch information
marek-safar authored Dec 28, 2021
1 parent acde546 commit eff08ef
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/mono/System.Private.CoreLib/src/System/Array.Mono.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private static void Copy(Array sourceArray, int sourceIndex, Array destinationAr
throw new ArgumentNullException(nameof(destinationArray));

if (length < 0)
throw new ArgumentOutOfRangeException(nameof(length), "Value has to be >= 0.");
throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NeedNonNegNum);

if (sourceArray.Rank != destinationArray.Rank)
throw new RankException(SR.Rank_MultiDimNotSupported);
Expand All @@ -153,19 +153,17 @@ private static void CopySlow(Array sourceArray, int sourceIndex, Array destinati
int dest_pos = destinationIndex - destinationArray.GetLowerBound(0);

if (source_pos < 0)
throw new ArgumentOutOfRangeException(nameof(sourceIndex), "Index was less than the array's lower bound in the first dimension.");
throw new ArgumentOutOfRangeException(nameof(sourceIndex), SR.ArgumentOutOfRange_ArrayLB);

if (dest_pos < 0)
throw new ArgumentOutOfRangeException(nameof(destinationIndex), "Index was less than the array's lower bound in the first dimension.");
throw new ArgumentOutOfRangeException(nameof(destinationIndex), SR.ArgumentOutOfRange_ArrayLB);

// re-ordered to avoid possible integer overflow
if (source_pos > sourceArray.Length - length)
throw new ArgumentException(SR.Arg_LongerThanSrcArray, nameof(sourceArray));

if (dest_pos > destinationArray.Length - length)
{
throw new ArgumentException("Destination array was not long enough. Check destIndex and length, and the array's lower bounds", nameof(destinationArray));
}
throw new ArgumentException(SR.Arg_LongerThanDestArray, nameof(destinationArray));

Type src_type = sourceArray.GetType().GetElementType()!;
Type dst_type = destinationArray.GetType().GetElementType()!;
Expand Down

0 comments on commit eff08ef

Please sign in to comment.