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

Guard several filesystems against crashes when identifying on a data buffer smaller than needed.

Browse Source
This commit is contained in:
Natalia Portillo
2021-06-04 18:42:29 +01:00
parent 4eb8bb3a08
commit ce353d6884
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Aaru.Filesystems/ProDOS.cs
View File

@@ -107,7 +107,7 @@ namespace Aaru.Filesystems
foreach(int offset in new[]
{
0, 0x200, 0x400, 0x600, 0x800, 0xA00
}.Where(offset => BitConverter.ToUInt16(tmp, offset) == 0 &&
}.Where(offset => tmp.Length > offset + 0x200 && BitConverter.ToUInt16(tmp, offset) == 0 &&
(byte)((tmp[offset + 0x04] & STORAGE_TYPE_MASK) >> 4) == ROOT_DIRECTORY_TYPE &&
tmp[offset + 0x23] == ENTRY_LENGTH && tmp[offset + 0x24] == ENTRIES_PER_BLOCK))
{
@@ -154,9 +154,9 @@ namespace Aaru.Filesystems
totalBlocks /= 4;
AaruConsole.DebugWriteLine("ProDOS plugin", "{0} <= ({1} - {2} + 1)? {3}", totalBlocks, partition.End,
partition.Start, totalBlocks <= (partition.End - partition.Start) + 1);
partition.Start, totalBlocks <= partition.End - partition.Start + 1);
return totalBlocks <= (partition.End - partition.Start) + 1;
return totalBlocks <= partition.End - partition.Start + 1;
}
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
@@ -326,7 +326,7 @@ namespace Aaru.Filesystems
Type = "ProDOS"
};
XmlFsType.ClusterSize = (uint)((((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) /
XmlFsType.ClusterSize = (uint)((partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
XmlFsType.Clusters);
if(!dateCorrect)