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

[FAT] Fix that first 2 FAT entries are not considered part of the allocation ones, allocating two more.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-08 14:15:24 +00:00
parent da68f27b3a
commit a450f0ca32
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Aaru.Filesystems/FAT/Info.cs
View File

@@ -726,7 +726,8 @@ public sealed partial class FAT
{ {
if(clusters < 4089) if(clusters < 4089)
{ {
ushort[] fat12 = new ushort[clusters]; // The first 2 FAT entries do not count as allocation clusters in FAT12 and FAT16
ushort[] fat12 = new ushort[clusters + 2];
_reservedSectors = fakeBpb.rsectors; _reservedSectors = fakeBpb.rsectors;
sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize; sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
@@ -751,14 +752,14 @@ public sealed partial class FAT
bool fat12Valid = fat12[0] >= FAT12_RESERVED && fat12[1] >= FAT12_RESERVED; bool fat12Valid = fat12[0] >= FAT12_RESERVED && fat12[1] >= FAT12_RESERVED;
if(fat12.Any(entry => entry < FAT12_RESERVED && entry > clusters)) if(fat12.Any(entry => entry < FAT12_RESERVED && entry > clusters + 2))
fat12Valid = false; fat12Valid = false;
ushort[] fat16 = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray(); ushort[] fat16 = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
bool fat16Valid = fat16[0] >= FAT16_RESERVED && fat16[1] >= 0x3FF0; bool fat16Valid = fat16[0] >= FAT16_RESERVED && fat16[1] >= 0x3FF0;
if(fat16.Any(entry => entry < FAT16_RESERVED && entry > clusters)) if(fat16.Any(entry => entry < FAT16_RESERVED && entry > clusters + 2))
fat16Valid = false; fat16Valid = false;
isFat12 = fat12Valid; isFat12 = fat12Valid;

17
Aaru.Filesystems/FAT/Super.cs
View File

@@ -315,7 +315,7 @@ public sealed partial class FAT
{ {
if(clusters < 4089) if(clusters < 4089)
{ {
ushort[] fat12 = new ushort[clusters]; ushort[] fat12 = new ushort[clusters + 1];
_reservedSectors = fakeBpb.rsectors; _reservedSectors = fakeBpb.rsectors;
sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize; sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
@@ -782,8 +782,9 @@ public sealed partial class FAT
_bytesPerCluster = _sectorsPerCluster * imagePlugin.Info.SectorSize; _bytesPerCluster = _sectorsPerCluster * imagePlugin.Info.SectorSize;
ushort[] firstFatEntries = new ushort[_statfs.Blocks]; // The first 2 FAT entries do not count as allocation clusters in FAT12 and FAT16
ushort[] secondFatEntries = new ushort[_statfs.Blocks]; ushort[] firstFatEntries = new ushort[_statfs.Blocks + 2];
ushort[] secondFatEntries = new ushort[_statfs.Blocks + 2];
bool firstFatValid = true; bool firstFatValid = true;
bool secondFatValid = true; bool secondFatValid = true;
@@ -813,7 +814,7 @@ public sealed partial class FAT
if(errno != ErrorNumber.NoError) if(errno != ErrorNumber.NoError)
return errno; return errno;
_fatEntries = new ushort[_statfs.Blocks]; _fatEntries = new ushort[_statfs.Blocks + 2];
pos = 0; pos = 0;
@@ -827,10 +828,10 @@ public sealed partial class FAT
secondFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4)); secondFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
} }
if(firstFatEntries.Any(entry => entry < FAT12_RESERVED && entry > _statfs.Blocks)) if(firstFatEntries.Any(entry => entry < FAT12_RESERVED && entry > _statfs.Blocks + 2))
firstFatValid = false; firstFatValid = false;
if(secondFatEntries.Any(entry => entry < FAT12_RESERVED && entry > _statfs.Blocks)) if(secondFatEntries.Any(entry => entry < FAT12_RESERVED && entry > _statfs.Blocks + 2))
secondFatValid = false; secondFatValid = false;
if(firstFatValid == secondFatValid) if(firstFatValid == secondFatValid)
@@ -860,10 +861,10 @@ public sealed partial class FAT
AaruConsole.DebugWriteLine("FAT plugin", Localization.Casting_FAT); AaruConsole.DebugWriteLine("FAT plugin", Localization.Casting_FAT);
secondFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray(); secondFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
if(firstFatEntries.Any(entry => entry < FAT16_RESERVED && entry > _statfs.Blocks)) if(firstFatEntries.Any(entry => entry < FAT16_RESERVED && entry > _statfs.Blocks + 2))
firstFatValid = false; firstFatValid = false;
if(secondFatEntries.Any(entry => entry < FAT16_RESERVED && entry > _statfs.Blocks)) if(secondFatEntries.Any(entry => entry < FAT16_RESERVED && entry > _statfs.Blocks + 2))
secondFatValid = false; secondFatValid = false;
if(firstFatValid == secondFatValid) if(firstFatValid == secondFatValid)