Skip to content
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

Jump to bottom

Change exception for overflow in ArrayBufferWriter #32587

Merged
merged 13 commits into from
Mar 25, 2020
Merged

Change exception for overflow in ArrayBufferWriter #32587

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d2935f2
Fix #609 - Part 2
felipepessoto Feb 20, 2020
fdc05a6
Test attributes. We don't need to limit to 64bit process, since the m…
felipepessoto Feb 20, 2020
5c2b37f
Remove platform restriction
felipepessoto Feb 21, 2020
785a7fe
Explicitly throw the OutOfMemoryException instead of rely on Array.Re…
felipepessoto Mar 23, 2020
1d5c5d0
Move ThrowOutOfMemoryException method
felipepessoto Mar 23, 2020
e394325
Missing message, BufferMaximumSizeExceeded
felipepessoto Mar 23, 2020
8fc9908
Code Coverage
felipepessoto Mar 24, 2020
0f4bc79
Resource file
felipepessoto Mar 24, 2020
3820344
Missing Resx update
felipepessoto Mar 24, 2020
2216a51
Restrict test to 64bits environment
felipepessoto Mar 24, 2020
85820da
Simple test so that we have some test coverage in inner loop
felipepessoto Mar 25, 2020
fbfeede
Test comment
felipepessoto Mar 25, 2020
7194215
Move OutOfMemory test to byte specific test
felipepessoto Mar 25, 2020
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
21 changes: 18 additions & 3 deletions src/libraries/Common/src/System/Buffers/ArrayBufferWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,24 @@ private void CheckAndResizeBuffer(int sizeHint)

if (sizeHint > FreeCapacity)
{
int growBy = Math.Max(sizeHint, _buffer.Length);
int currentLength = _buffer.Length;
int growBy = Math.Max(sizeHint, currentLength);

if (_buffer.Length == 0)
if (currentLength == 0)
{
growBy = Math.Max(growBy, DefaultInitialBufferSize);
}

int newSize = checked(_buffer.Length + growBy);
int newSize = currentLength + growBy;

if ((uint)newSize > int.MaxValue)
{
newSize = currentLength + sizeHint;
if ((uint)newSize > int.MaxValue)
{
ThrowOutOfMemoryException((uint)newSize);
}
}

Array.Resize(ref _buffer, newSize);
}
Expand All @@ -186,5 +196,10 @@ private static void ThrowInvalidOperationException_AdvancedTooFar(int capacity)
{
throw new InvalidOperationException(SR.Format(SR.BufferWriterAdvancedTooFar, capacity));
}

private static void ThrowOutOfMemoryException(uint capacity)
felipepessoto marked this conversation as resolved.
Show resolved Hide resolved
{
throw new OutOfMemoryException(SR.Format(SR.BufferMaximumSizeExceeded, capacity));
felipepessoto marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
7 changes: 7 additions & 0 deletions src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.T.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,13 @@ public void GetMemory_DefaultCtor(int sizeHint)
Assert.Equal(sizeHint <= 256 ? 256 : sizeHint, memory.Length);
}

[Fact]
public void GetMemory_ExceedMaximumBufferSize()
felipepessoto marked this conversation as resolved.
Show resolved Hide resolved
{
var output = new ArrayBufferWriter<T>(256);
Assert.Throws<OutOfMemoryException>(() => output.GetMemory(int.MaxValue));
felipepessoto marked this conversation as resolved.
Show resolved Hide resolved
}

[Fact]
public void GetMemory_InitSizeCtor()
{
Expand Down