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

Detect incorrect DVD images in CDRWin disc image format created by MagicISO. Fixes #518

Browse Source
This commit is contained in:
Natalia Portillo
2021-06-06 17:34:17 +01:00
parent 0fc8f6996e
commit 698c7276e4
1 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Aaru.Images/CDRWin/Read.cs
View File

@@ -899,6 +899,55 @@ namespace Aaru.DiscImages
_discImage.Tracks.Add(cueTracks[t - 1]);
}
// MagicISO writes 2048 bytes per data, sets Cuesheet as 2352, and fill the images with empty data.
if(_discImage.Tracks.Count == 1 &&
_discImage.Tracks[0].TrackType == "MODE1/2352")
{
Stream track1Stream = _discImage.Tracks[0].TrackFile.DataFilter.GetDataForkStream();
bool foundSync = true;
var rnd = new Random();
// We check 32 random positions, to prevent coincidence of data
for(int i = 0; i < 32; i++)
{
int next = rnd.Next((int)_imageInfo.Sectors);
track1Stream.Position = next * 2352;
byte[] data = new byte[16];
track1Stream.Read(data, 0, 16);
// If the position is not MODEx/2352, it can't be a correct Cuesheet.
if(data[0x000] == 0x00 &&
data[0x001] == 0xFF &&
data[0x002] == 0xFF &&
data[0x003] == 0xFF &&
data[0x004] == 0xFF &&
data[0x005] == 0xFF &&
data[0x006] == 0xFF &&
data[0x007] == 0xFF &&
data[0x008] == 0xFF &&
data[0x009] == 0xFF &&
data[0x00A] == 0xFF &&
data[0x00B] == 0x00)
continue;
foundSync = false;
break;
}
if(!foundSync)
{
_discImage.Tracks[0].Pregap = 0;
_discImage.Tracks[0].Bps = 2048;
_discImage.Tracks[0].TrackType = CDRWIN_TRACK_TYPE_MODE1;
_imageInfo.Application = "ISOBuster";
_discImage.MediaType = MediaType.DVDROM;
}
}
if(!string.IsNullOrWhiteSpace(_discImage.AaruMediaType) &&
Enum.TryParse(_discImage.AaruMediaType, true, out MediaType mediaType))
{
@@ -906,7 +955,7 @@ namespace Aaru.DiscImages
}
else if(_discImage.IsRedumpGigadisc)
_discImage.MediaType = MediaType.GDROM;
else
else if(_discImage.MediaType == MediaType.Unknown)
_discImage.MediaType = CdrWinIsoBusterDiscTypeToMediaType(_discImage.OriginalMediaType);
if(_discImage.MediaType == MediaType.Unknown ||