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/DART/Identify.cs
View File

@@ -49,7 +49,7 @@ public sealed partial class Dart
stream.Seek(0, SeekOrigin.Begin);
var headerB = new byte[Marshal.SizeOf<Header>()];
stream.Read(headerB, 0, Marshal.SizeOf<Header>());
stream.EnsureRead(headerB, 0, Marshal.SizeOf<Header>());
Header header = Marshal.ByteArrayToStructureBigEndian<Header>(headerB);
if(header.srcCmp > COMPRESS_NONE)

10
Aaru.Images/DART/Read.cs
View File

@@ -58,7 +58,7 @@ public sealed partial class Dart
stream.Seek(0, SeekOrigin.Begin);
var headerB = new byte[Marshal.SizeOf<Header>()];
stream.Read(headerB, 0, Marshal.SizeOf<Header>());
stream.EnsureRead(headerB, 0, Marshal.SizeOf<Header>());
Header header = Marshal.ByteArrayToStructureBigEndian<Header>(headerB);
if(header.srcCmp > COMPRESS_NONE)
@@ -115,7 +115,7 @@ public sealed partial class Dart
for(var i = 0; i < bLength.Length; i++)
{
var tmpShort = new byte[2];
stream.Read(tmpShort, 0, 2);
stream.EnsureRead(tmpShort, 0, 2);
bLength[i] = BigEndianBitConverter.ToInt16(tmpShort, 0);
}
@@ -129,7 +129,7 @@ public sealed partial class Dart
if(l == -1)
{
stream.Read(buffer, 0, BUFFER_SIZE);
stream.EnsureRead(buffer, 0, BUFFER_SIZE);
dataMs.Write(buffer, 0, DATA_SIZE);
tagMs.Write(buffer, DATA_SIZE, TAG_SIZE);
}
@@ -140,7 +140,7 @@ public sealed partial class Dart
if(header.srcCmp == COMPRESS_RLE)
{
temp = new byte[l * 2];
stream.Read(temp, 0, temp.Length);
stream.EnsureRead(temp, 0, temp.Length);
buffer = new byte[BUFFER_SIZE];
AppleRle.DecodeBuffer(temp, buffer);
@@ -151,7 +151,7 @@ public sealed partial class Dart
else
{
temp = new byte[l];
stream.Read(temp, 0, temp.Length);
stream.EnsureRead(temp, 0, temp.Length);
AaruConsole.ErrorWriteLine("LZH Compressed images not yet supported");