Skip to content

Fix handling of partial reads in SqlBytes #82620

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
stephentoub merged 1 commit into from
Feb 24, 2023
Merged

Fix handling of partial reads in SqlBytes #82620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLBytes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public byte[] Value
buffer = new byte[_stream.Length];
if (_stream.Position != 0)
_stream.Seek(0, SeekOrigin.Begin);
_stream.Read(buffer, 0, checked((int)_stream.Length));
_stream.ReadExactly(buffer, 0, checked((int)_stream.Length));
break;

default:
Expand Down Expand Up @@ -319,7 +319,7 @@ public long Read(long offset, byte[] buffer, int offsetInBuffer, int count)
case SqlBytesCharsState.Stream:
if (_stream!.Position != offset)
_stream.Seek(offset, SeekOrigin.Begin);
_stream.Read(buffer, offsetInBuffer, count);
count = _stream.Read(buffer, offsetInBuffer, count);
break;

default:
Expand Down Expand Up @@ -456,7 +456,7 @@ private void CopyStreamToBuffer()
if (_stream.Position != 0)
_stream.Seek(0, SeekOrigin.Begin);

_stream.Read(_rgbBuf, 0, (int)lStreamLen);
_stream.ReadExactly(_rgbBuf, 0, (int)lStreamLen);
_stream = null;
_lCurLen = lStreamLen;
_state = SqlBytesCharsState.Buffer;
Expand Down
29 changes: 29 additions & 0 deletions src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlBytesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,5 +373,34 @@ public void Write_NegativeCountTest()

Assert.Throws<ArgumentOutOfRangeException>(() => bytes.Write(0, b1, 0, -1));
}

[Fact]
public void SqlBytes_FromStream_BufferContainsExpectedData()
{
var bytes = new SqlBytes(new TrickleStream(new byte[] { 1, 2, 3, 4, 5 }));
Assert.Equal("01-02-03-04-05", BitConverter.ToString(bytes.Buffer));
}

[Fact]
public void SqlBytes_FromStream_ValueContainsExpectedData()
{
var bytes = new SqlBytes(new TrickleStream(new byte[] { 1, 2, 3, 4, 5 }));
Assert.Equal("01-02-03-04-05", BitConverter.ToString(bytes.Value));
}

[Fact]
public void SqlBytes_FromStream_ReadReturnsExpectedCount()
{
var bytes = new SqlBytes(new TrickleStream(new byte[] { 1, 2, 3, 4, 5 }));
byte[] buffer = new byte[5];
long bytesRead = bytes.Read(0, buffer, 0, buffer.Length);
Assert.Equal(1, bytesRead);
}

private sealed class TrickleStream : MemoryStream
{
public TrickleStream(byte[] bytes) : base(bytes) { }
public override int Read(byte[] buffer, int offset, int count) => base.Read(buffer, offset, Math.Min(count, 1));
}
}
}