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

Add more checks for partitions that end, or start, after end

Browse Source 
of device.
This commit is contained in:
Natalia Portillo
2017-08-07 16:09:46 +01:00
parent fa6bacdedd
commit 5ce40b68d0
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DiscImageChef.Partitions/AppleMap.cs
View File

@@ -311,15 +311,22 @@ namespace DiscImageChef.PartPlugins
}
_partition.Description = sb.ToString();
// Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
if(_partition.End < imagePlugin.ImageInfo.sectors)
if(_partition.Start < imagePlugin.ImageInfo.sectors && _partition.End < imagePlugin.ImageInfo.sectors)
{
partitions.Add(_partition);
sequence++;
}
// Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
else if(_partition.Start < imagePlugin.ImageInfo.sectors)
{
DicConsole.DebugWriteLine("AppleMap Plugin", "Cutting last partition end ({0}) to media size ({1})", _partition.End, imagePlugin.ImageInfo.sectors - 1);
_partition.Length = imagePlugin.ImageInfo.sectors - _partition.Start;
partitions.Add(_partition);
sequence++;
}
else
{
DicConsole.DebugWriteLine("AppleMap Plugin", "Not adding partition because end ({0}) is outside media size ({1})", _partition.End, imagePlugin.ImageInfo.sectors);
DicConsole.DebugWriteLine("AppleMap Plugin", "Not adding partition becaus start ({0}) is outside media size ({1})", _partition.Start, imagePlugin.ImageInfo.sectors - 1);
}
}
}