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

7
Aaru.Images/VDI/Read.cs
View File

@@ -40,6 +40,7 @@ using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
public sealed partial class Vdi
@@ -54,7 +55,7 @@ public sealed partial class Vdi
return ErrorNumber.InvalidArgument;
var vHdrB = new byte[Marshal.SizeOf<Header>()];
stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
stream.EnsureRead(vHdrB, 0, Marshal.SizeOf<Header>());
_vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.creator = {0}", _vHdr.creator);
@@ -98,7 +99,7 @@ public sealed partial class Vdi
AaruConsole.DebugWriteLine("VirtualBox plugin", "Reading Image Block Map");
stream.Seek(_vHdr.offsetBlocks, SeekOrigin.Begin);
var ibmB = new byte[_vHdr.blocks * 4];
stream.Read(ibmB, 0, ibmB.Length);
stream.EnsureRead(ibmB, 0, ibmB.Length);
_ibm = MemoryMarshal.Cast<byte, uint>(ibmB).ToArray();
DateTime end = DateTime.UtcNow;
@@ -222,7 +223,7 @@ public sealed partial class Vdi
var cluster = new byte[_vHdr.blockSize];
_imageStream.Seek((long)imageOff, SeekOrigin.Begin);
_imageStream.Read(cluster, 0, (int)_vHdr.blockSize);
_imageStream.EnsureRead(cluster, 0, (int)_vHdr.blockSize);
buffer = new byte[_vHdr.sectorSize];
Array.Copy(cluster, (int)secOff, buffer, 0, _vHdr.sectorSize);