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

Fix reading long sectors from AaruFormat image when all suffixes and prefixes are standard.

Browse Source
This commit is contained in:
Natalia Portillo
2022-03-05 11:34:27 +00:00
parent 5b6abf677f
commit 517fda0b40
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,7 +284,7 @@ namespace Aaru.DiscImages
case DataType.CdSectorPrefixCorrected:
if(entry.dataType == DataType.CdSectorPrefixCorrected)
{
_sectorPrefixMs = new NonClosableStream();
_sectorPrefixMs ??= new NonClosableStream();
_sectorPrefixMs.Write(data, 0, data.Length);
}
else
@@ -304,7 +304,7 @@ namespace Aaru.DiscImages
case DataType.CdSectorSuffixCorrected:
if(entry.dataType == DataType.CdSectorSuffixCorrected)
{
_sectorSuffixMs = new NonClosableStream();
_sectorSuffixMs ??= new NonClosableStream();
_sectorSuffixMs.Write(data, 0, data.Length);
}
else
@@ -515,10 +515,12 @@ namespace Aaru.DiscImages
{
case DataType.CdSectorPrefixCorrected:
_sectorPrefixDdt = cdDdt;
_sectorPrefixMs = new NonClosableStream();
break;
case DataType.CdSectorSuffixCorrected:
_sectorSuffixDdt = cdDdt;
_sectorSuffixMs = new NonClosableStream();
break;
}
@@ -1972,8 +1974,8 @@ namespace Aaru.DiscImages
throw new ArgumentOutOfRangeException(nameof(sectorAddress),
"Can't found track containing requested sector");
if((_sectorSuffix == null || _sectorPrefix == null) &&
(_sectorSuffixMs == null || _sectorPrefixMs == null))
if((_sectorSuffix == null || _sectorPrefix == null) &&
(_sectorSuffixDdt == null || _sectorPrefixDdt == null))
return ReadSector(sectorAddress);
byte[] sector = new byte[2352];