Learning/s7netplus
0
0
Fork 0
mirror of https://github.com/S7NetPlus/s7netplus.git synced 2026-02-17 22:38:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust ReadFixed implementation somewhat. Exceeding the length of the buffer was already an error before.

Browse Source 
Change the tests by replacing the memory buffer with a Fake stream giving 1 byte at a time.
This commit is contained in:
Serge Camille
2020-08-18 23:41:07 +02:00
parent 10e5562706
commit 09c8b18d3d
3 changed files with 90 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
S7.Net/StreamExtensions.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Threading.Tasks;
@@ -19,12 +19,11 @@ namespace S7.Net
/// <returns>returns the amount of read bytes</returns>
public static int ReadFixed(this Stream stream, byte[] buffer, int offset, int count)
{
int read = offset;
int read = 0;
int received;
count = Math.Min(count, buffer.Length - offset);
do
{
received = stream.Read(buffer, read, count - read);
received = stream.Read(buffer, offset + read, count - read);
read += received;
}
while (read < count && received > 0);
@@ -42,12 +41,11 @@ namespace S7.Net
/// <returns>returns the amount of read bytes</returns>
public static async Task<int> ReadFixedAsync(this Stream stream, byte[] buffer, int offset, int count)
{
int read = offset;
int read = 0;
int received;
count = Math.Min(count, buffer.Length - offset);
do
{
received = await stream.ReadAsync(buffer, read, count - read);
received = await stream.ReadAsync(buffer, offset + read, count - read);
read += received;
}
while (read < count && received > 0);