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

Do not add drivers of size 0 neither Apple_Free partitions as

Browse Source 
these can expand beyond the disc on optical media.
This commit is contained in:
Natalia Portillo
2017-07-20 13:12:36 +01:00
parent c41645b376
commit 290cb74540
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DiscImageChef.Partitions/AppleMap.cs
View File

@@ -109,6 +109,9 @@ namespace DiscImageChef.PartPlugins
DicConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddSize = {0}", ddm.sbMap[i].ddSize, i); DicConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddSize = {0}", ddm.sbMap[i].ddSize, i);
DicConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddType = {0}", ddm.sbMap[i].ddType, i); DicConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddType = {0}", ddm.sbMap[i].ddType, i);
if(ddm.sbMap[i].ddSize == 0)
continue;
CommonTypes.Partition part = new CommonTypes.Partition() CommonTypes.Partition part = new CommonTypes.Partition()
{ {
Size = (ulong)(ddm.sbMap[i].ddSize * 512), Size = (ulong)(ddm.sbMap[i].ddSize * 512),
@@ -119,6 +122,9 @@ namespace DiscImageChef.PartPlugins
Type = "Apple_Driver" Type = "Apple_Driver"
}; };
if((ddm.sbMap[i].ddSize * 512) % sector_size > 0)
part.Length++;
partitions.Add(part); partitions.Add(part);
sequence++; sequence++;
@@ -261,7 +267,9 @@ namespace DiscImageChef.PartPlugins
// BeOS doesn't mark its partitions as valid // BeOS doesn't mark its partitions as valid
//if(flags.HasFlag(AppleMapFlags.Valid) && //if(flags.HasFlag(AppleMapFlags.Valid) &&
if(StringHandlers.CToString(entry.type) != "Apple_partition_map" && entry.sectors > 0) if(StringHandlers.CToString(entry.type) != "Apple_partition_map" && entry.sectors > 0 &&
// Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
StringHandlers.CToString(entry.type) != "Apple_Free")
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();