Skip to content

PipeStream bug fixes #1070

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

Closed
wants to merge 2 commits into from
Closed

PipeStream bug fixes #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67bcab1
PipeStream bug fixes
Jan 25, 2023
d9c1e41
Don't touch null events in the thread pool thread if the shell has be…
Jan 26, 2023
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: 2 additions & 4 deletions src/Renci.SshNet/Common/PipeStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,6 @@ public override void SetLength(long value)
///<exception cref="ArgumentOutOfRangeException">offset or count is negative.</exception>
public override int Read(byte[] buffer, int offset, int count)
{
if (offset != 0)
throw new NotSupportedException("Offsets with value of non-zero are not supported");
if (buffer == null)
throw new ArgumentNullException("buffer");
if (offset + count > buffer.Length)
Expand Down Expand Up @@ -213,7 +211,7 @@ public override int Read(byte[] buffer, int offset, int count)
// fill the read buffer
for (; readLength < count && _buffer.Count > 0; readLength++)
{
buffer[readLength] = _buffer.Dequeue();
buffer[readLength + offset] = _buffer.Dequeue();
}

Monitor.Pulse(_buffer);
Expand All @@ -230,7 +228,7 @@ public override int Read(byte[] buffer, int offset, int count)
private bool ReadAvailable(int count)
{
var length = Length;
return (_isFlushed || length >= count) && (length >= (count + 1) || !BlockLastReadBuffer);
return (_isFlushed || length > 0) && (length >= (count + 1) || !BlockLastReadBuffer);
}

///<summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Renci.SshNet/Shell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void Start()
}
finally
{
_dataReaderTaskCompleted.Set();
_dataReaderTaskCompleted?.Set();
}
});

Expand Down