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

Check for real presence of a GPT not just their partition

Browse Source 
types.
This commit is contained in:
Natalia Portillo
2017-08-07 16:12:08 +01:00
parent e5958ab60b
commit 1a843b0cce
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
DiscImageChef.Partitions/MBR.cs
View File

@@ -42,6 +42,8 @@ namespace DiscImageChef.PartPlugins
// TODO: Support AAP extensions // TODO: Support AAP extensions
public class MBR : PartPlugin public class MBR : PartPlugin
{ {
const ulong GptMagic = 0x5452415020494645;
public MBR() public MBR()
{ {
Name = "Master Boot Record"; Name = "Master Boot Record";
@@ -84,6 +86,24 @@ namespace DiscImageChef.PartPlugins
if(mbr.magic != MBR_Magic) if(mbr.magic != MBR_Magic)
return false; // Not MBR return false; // Not MBR
byte[] hdrBytes = imagePlugin.ReadSector(1 + sectorOffset);
ulong signature = BitConverter.ToUInt64(hdrBytes, 0);
DicConsole.DebugWriteLine("MBR Plugin", "gpt.signature = 0x{0:X16}", signature);
if(signature == GptMagic)
return false;
if(signature != GptMagic && imagePlugin.ImageInfo.xmlMediaType == XmlMediaType.OpticalDisc)
{
hdrBytes = imagePlugin.ReadSector(sectorOffset);
signature = BitConverter.ToUInt64(hdrBytes, 512);
DicConsole.DebugWriteLine("MBR Plugin", "gpt.signature @ 0x200 = 0x{0:X16}", signature);
if(signature == GptMagic)
return false;
}
MBRPartitionEntry[] entries; MBRPartitionEntry[] entries;
if(mbr_ontrack.dm_magic == DM_Magic) if(mbr_ontrack.dm_magic == DM_Magic)
@@ -111,8 +131,6 @@ namespace DiscImageChef.PartPlugins
if(entry.status != 0x00 && entry.status != 0x80) if(entry.status != 0x00 && entry.status != 0x80)
return false; // Maybe a FAT filesystem return false; // Maybe a FAT filesystem
valid &= entry.type != 0x00; valid &= entry.type != 0x00;
if(entry.type == 0xEE || entry.type == 0xEF)
return false; // This is a GPT
if(entry.type == 0x05 || entry.type == 0x0F || entry.type == 0x15 || entry.type == 0x1F || entry.type == 0x85 || if(entry.type == 0x05 || entry.type == 0x0F || entry.type == 0x15 || entry.type == 0x1F || entry.type == 0x85 ||
entry.type == 0x91 || entry.type == 0x9B || entry.type == 0xC5 || entry.type == 0xCF || entry.type == 0xD5) entry.type == 0x91 || entry.type == 0x9B || entry.type == 0xC5 || entry.type == 0xCF || entry.type == 0xD5)
{ {