Remove _isBlocked constraint from StreamReader.Peek() #89609
Conversation
|
Tagging subscribers to this area: @dotnet/area-system-io Issue DetailsFixes #68983 The bug was uncovered by the partial and zero-byte reads in DeflateStream breaking change i.e: the bug is not a regression.
|
| public class ReadOneAtATimeStream : Stream | ||
| { | ||
| MemoryStream _memoryStream; | ||
|
|
||
| public ReadOneAtATimeStream(byte[] buffer) | ||
| { | ||
| _memoryStream = new MemoryStream(buffer); | ||
| } | ||
|
|
||
| public override bool CanRead => true; | ||
|
|
||
| public override bool CanSeek => false; | ||
|
|
||
| public override bool CanWrite => false; | ||
|
|
||
| public override long Length => _memoryStream.Length; | ||
|
|
||
| public override long Position | ||
| { | ||
| get => _memoryStream.Position; | ||
| set => throw new NotSupportedException(); | ||
| } | ||
|
|
||
| public override int Read(byte[] buffer, int offset, int count) | ||
| { | ||
| if (count == 0 || Position == Length) | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
| _memoryStream.ReadExactly(buffer, offset, 1); | ||
| return 1; | ||
| } | ||
|
|
||
| public override void Flush() { } | ||
| public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException(); | ||
| public override void SetLength(long value) => throw new NotSupportedException(); | ||
| public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException(); | ||
| } |
There was a problem hiding this comment.
Could you simplify this by just deriving from MemoryStream instead of Stream?
There was a problem hiding this comment.
We also have a DelegateStream type in tests; it lets you just construct an instance, supplying the ctor with a delegate to use for various operations, so you might not even have to declare your own type. And if you do continue to have your own, assuming you derive from MemoryStream such that it can be really short, you could just make it a private nested class right next to the test that's using it.
There was a problem hiding this comment.
Could you simplify this by just deriving from MemoryStream instead of Stream?
I tried this first but realized that by overriding Read to call ReadExactly it would cause an infinite recursion loop.
I could achieve it if I call ReadByte but I thought that may break in the future if MemoryStream's ReadByte implementation changed to depend on Read, which is a pattern many Streams do.
Will change it to use the DelegateStream as suggested.
ghost
locked as resolved and limited conversation to collaborators
Fixes #68983
The bug was uncovered by the partial and zero-byte reads in DeflateStream breaking change i.e: the bug is not a regression.