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

2
Aaru.Images/WCDiskImage/Identify.cs
View File

@@ -50,7 +50,7 @@ public sealed partial class WCDiskImage
return false;
var header = new byte[32];
stream.Read(header, 0, 32);
stream.EnsureRead(header, 0, 32);
FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);

14
Aaru.Images/WCDiskImage/Read.cs
View File

@@ -53,7 +53,7 @@ public sealed partial class WCDiskImage
stream.Seek(0, SeekOrigin.Begin);
var header = new byte[32];
stream.Read(header, 0, 32);
stream.EnsureRead(header, 0, 32);
FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);
@@ -129,7 +129,7 @@ public sealed partial class WCDiskImage
{
AaruConsole.DebugWriteLine("d2f plugin", "Comment present, reading");
var sheaderBuffer = new byte[6];
stream.Read(sheaderBuffer, 0, 6);
stream.EnsureRead(sheaderBuffer, 0, 6);
SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
@@ -141,7 +141,7 @@ public sealed partial class WCDiskImage
}
var comm = new byte[sheader.crc];
stream.Read(comm, 0, sheader.crc);
stream.EnsureRead(comm, 0, sheader.crc);
comments += Encoding.ASCII.GetString(comm) + Environment.NewLine;
}
@@ -149,7 +149,7 @@ public sealed partial class WCDiskImage
{
AaruConsole.DebugWriteLine("d2f plugin", "Directory listing present, reading");
var sheaderBuffer = new byte[6];
stream.Read(sheaderBuffer, 0, 6);
stream.EnsureRead(sheaderBuffer, 0, 6);
SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
@@ -161,7 +161,7 @@ public sealed partial class WCDiskImage
}
var dir = new byte[sheader.crc];
stream.Read(dir, 0, sheader.crc);
stream.EnsureRead(dir, 0, sheader.crc);
comments += Encoding.ASCII.GetString(dir);
}
@@ -245,7 +245,7 @@ public sealed partial class WCDiskImage
{
/* read the sector header */
var sheaderBuffer = new byte[6];
stream.Read(sheaderBuffer, 0, 6);
stream.EnsureRead(sheaderBuffer, 0, 6);
SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
@@ -266,7 +266,7 @@ public sealed partial class WCDiskImage
switch(sheader.flag)
{
case SectorFlag.Normal: /* read a normal sector and store it in cache */
stream.Read(sectorData, 0, 512);
stream.EnsureRead(sectorData, 0, 512);
_sectorCache[(cyl, head, sect)] = sectorData;
CRC16IBMContext.Data(sectorData, 512, out byte[] crc);
var calculatedCRC = (short)((256 * crc[0]) | crc[1]);