Fix memorystream local test failure #123709
Conversation
|
Tagging subscribers to this area: @dotnet/area-system-io |
There was a problem hiding this comment.
Pull request overview
This PR fixes a test failure in MemoryStream_CapacityBoundaryChecks by adding explicit validation to throw ArgumentOutOfRangeException when setting the Capacity property to a value exceeding Array.MaxLength. Previously, attempting to set an invalid capacity would result in an OutOfMemoryException during array allocation, but the test expected ArgumentOutOfRangeException.
Changes:
- Added validation in the
Capacitysetter to throwArgumentOutOfRangeExceptionbefore attempting array allocation when the capacity exceeds the maximum allowed array length
src/libraries/System.Private.CoreLib/src/System/IO/MemoryStream.cs
Outdated
Show resolved
Hide resolved
…m.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
| if (value < Length) | ||
| throw new ArgumentOutOfRangeException(nameof(value), SR.ArgumentOutOfRange_SmallCapacity); | ||
| if (value > MemStreamMaxLength) | ||
| throw new ArgumentOutOfRangeException(nameof(value), SR.ArgumentOutOfRange_Capacity); |
There was a problem hiding this comment.
Has this always resulted in an OOMException, even on .NET Framework? Or did it used to throw an ArgumentException for this, that regressed, and now this is just fixing the regression?
| @@ -263,6 +263,8 @@ public virtual int Capacity | |||
| // Special behavior if the MS isn't expandable: we don't throw if value is the same as the current capacity | |||
| if (value < Length) | |||
| throw new ArgumentOutOfRangeException(nameof(value), SR.ArgumentOutOfRange_SmallCapacity); | |||
| if (value > MemStreamMaxLength) | |||
| throw new ArgumentOutOfRangeException(nameof(value), SR.ArgumentOutOfRange_Capacity); | |||
There was a problem hiding this comment.
We don't use ArgumentOutOfRange_Capacity anywhere else in MemoryStream and what we use in other places e.g. ArgumentOutOfRange_StreamLength, includes the maximum array length:
Stream length must be non-negative and less than the maximum array length {0} - origin.
Should we add a new string mentioning that?
3 participants
Follow up for #123440