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

@@ -48,7 +48,7 @@ public sealed partial class Apple2Mg
return false;
var header = new byte[64];
stream.Read(header, 0, 64);
stream.EnsureRead(header, 0, 64);
Header hdr = Marshal.SpanToStructureLittleEndian<Header>(header);

12
Aaru.Images/Apple2MG/Read.cs
View File

@@ -53,7 +53,7 @@ public sealed partial class Apple2Mg
_imageHeader = new Header();
var header = new byte[64];
stream.Read(header, 0, 64);
stream.EnsureRead(header, 0, 64);
var magic = new byte[4];
var creator = new byte[4];
@@ -108,7 +108,7 @@ public sealed partial class Apple2Mg
case SectorOrder.Nibbles:
tmp = new byte[_imageHeader.DataSize];
stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
stream.Read(tmp, 0, tmp.Length);
stream.EnsureRead(tmp, 0, tmp.Length);
var nibPlugin = new AppleNib();
var noFilter = new ZZZNoFilter();
noFilter.Open(tmp);
@@ -126,7 +126,7 @@ public sealed partial class Apple2Mg
case SectorOrder.ProDos when _imageHeader.DataSize == 143360:
stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
tmp = new byte[_imageHeader.DataSize];
stream.Read(tmp, 0, tmp.Length);
stream.EnsureRead(tmp, 0, tmp.Length);
bool isDos = tmp[0x11001] == 17 && tmp[0x11002] < 16 && tmp[0x11027] <= 122 && tmp[0x11034] == 35 &&
tmp[0x11035] == 16 && tmp[0x11036] == 0 && tmp[0x11037] == 1;
@@ -152,7 +152,7 @@ public sealed partial class Apple2Mg
case SectorOrder.Dos when _imageHeader.DataSize == 819200:
stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
tmp = new byte[_imageHeader.DataSize];
stream.Read(tmp, 0, tmp.Length);
stream.EnsureRead(tmp, 0, tmp.Length);
_decodedImage = new byte[_imageHeader.DataSize];
offsets = _interleave;
@@ -198,7 +198,7 @@ public sealed partial class Apple2Mg
stream.Seek(_imageHeader.CommentOffset, SeekOrigin.Begin);
var comments = new byte[_imageHeader.CommentSize];
stream.Read(comments, 0, (int)_imageHeader.CommentSize);
stream.EnsureRead(comments, 0, (int)_imageHeader.CommentSize);
_imageInfo.Comments = Encoding.ASCII.GetString(comments);
}
@@ -294,7 +294,7 @@ public sealed partial class Apple2Mg
stream.Seek((long)(_imageHeader.DataOffset + sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
stream.EnsureRead(buffer, 0, (int)(length * _imageInfo.SectorSize));
}
return ErrorNumber.NoError;

2
Aaru.Images/Apple2MG/Write.cs
View File

@@ -196,7 +196,7 @@ public sealed partial class Apple2Mg
_writingStream.Seek(0x40 + 17 * 16 * 256, SeekOrigin.Begin);
var tmp = new byte[256];
_writingStream.Read(tmp, 0, tmp.Length);
_writingStream.EnsureRead(tmp, 0, tmp.Length);
bool isDos = tmp[0x01] == 17 && tmp[0x02] < 16 && tmp[0x27] <= 122 && tmp[0x34] == 35 && tmp[0x35] == 16 &&
tmp[0x36] == 0 && tmp[0x37] == 1;