aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Stream extension to ensure read operations return the requested number of bytes (unless EOF arrives first).

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-14 09:43:16 +00:00
parent f90cc6593f
commit 0eb589d785
178 changed files with 862 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Aaru.Images/CPCDSK/Read.cs
View File

@@ -57,7 +57,7 @@ public sealed partial class Cpcdsk
return ErrorNumber.InvalidArgument;
var headerB = new byte[256];
stream.Read(headerB, 0, 256);
stream.EnsureRead(headerB, 0, 256);
int pos;
@@ -72,7 +72,7 @@ public sealed partial class Cpcdsk
string magic = Encoding.ASCII.GetString(headerB, 0, pos);
stream.Position = pos + 2;
stream.Read(headerB, 0, 256);
stream.EnsureRead(headerB, 0, 256);
DiskInfo header = Marshal.ByteArrayToStructureLittleEndian<DiskInfo>(headerB);
@@ -125,7 +125,7 @@ public sealed partial class Cpcdsk
long trackPos = stream.Position;
var trackB = new byte[256];
stream.Read(trackB, 0, 256);
stream.EnsureRead(trackB, 0, 256);
TrackInfo trackInfo = Marshal.ByteArrayToStructureLittleEndian<TrackInfo>(trackB);
if(string.Compare(TRACK_ID, Encoding.ASCII.GetString(trackInfo.magic),
@@ -199,7 +199,7 @@ public sealed partial class Cpcdsk
: SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size);
var sector = new byte[sectLen];
stream.Read(sector, 0, sectLen);
stream.EnsureRead(sector, 0, sectLen);
if(sectLen < SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size))
{