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

Added more sanity checks.

Browse Source
This commit is contained in:
Natalia Portillo
2017-08-03 01:30:33 +01:00
parent 09deb53089
commit ede4cead4b
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscImageChef.Partitions/PC98.cs
View File

@@ -54,8 +54,11 @@ namespace DiscImageChef.PartPlugins
{ {
partitions = new List<Partition>(); partitions = new List<Partition>();
byte[] bootSector = imagePlugin.ReadSector(sectorOffset); if(sectorOffset != 0)
byte[] sector = imagePlugin.ReadSector(1 + sectorOffset); return false;
byte[] bootSector = imagePlugin.ReadSector(0);
byte[] sector = imagePlugin.ReadSector(1);
if(bootSector[bootSector.Length-2] != 0x55 || bootSector[bootSector.Length - 1] != 0xAA) if(bootSector[bootSector.Length-2] != 0x55 || bootSector[bootSector.Length - 1] != 0xAA)
return false; return false;
@@ -85,7 +88,13 @@ namespace DiscImageChef.PartPlugins
DicConsole.DebugWriteLine("PC98 plugin", "entry.dp_name = \"{0}\"", StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932))); DicConsole.DebugWriteLine("PC98 plugin", "entry.dp_name = \"{0}\"", StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
if(entry.dp_scyl != entry.dp_ecyl && if(entry.dp_scyl != entry.dp_ecyl &&
entry.dp_ecyl > 0) entry.dp_ecyl > 0 &&
entry.dp_scyl <= imagePlugin.ImageInfo.cylinders &&
entry.dp_ecyl <= imagePlugin.ImageInfo.cylinders &&
entry.dp_shd <= imagePlugin.ImageInfo.heads &&
entry.dp_ehd <= imagePlugin.ImageInfo.heads &&
entry.dp_ssect <= imagePlugin.ImageInfo.sectorsPerTrack &&
entry.dp_esect <= imagePlugin.ImageInfo.sectorsPerTrack)
{ {
Partition part = new Partition Partition part = new Partition
@@ -109,7 +118,8 @@ namespace DiscImageChef.PartPlugins
DicConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size); DicConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
if(part.Start < imagePlugin.ImageInfo.sectors && if(((entry.dp_mid & 0x20) == 0x20 || (entry.dp_mid & 0x44) == 0x44) &&
part.Start < imagePlugin.ImageInfo.sectors &&
part.End <= imagePlugin.ImageInfo.sectors) part.End <= imagePlugin.ImageInfo.sectors)
{ {
partitions.Add(part); partitions.Add(part);