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

Prevent image-info to crash if TOC or PMA are empty.

Browse Source
This commit is contained in:
Natalia Portillo
2018-06-23 20:38:54 +01:00
parent 3176377d3d
commit 0689a26e91
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.Core/ImageInfo.cs
View File

@@ -207,6 +207,8 @@ namespace DiscImageChef.Core
{ {
byte[] toc = imageFormat.ReadDiskTag(MediaTagType.CD_FullTOC); byte[] toc = imageFormat.ReadDiskTag(MediaTagType.CD_FullTOC);
if(toc.Length > 0)
{
ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(toc, 0)); ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(toc, 0));
if(dataLen + 2 != toc.Length) if(dataLen + 2 != toc.Length)
{ {
@@ -221,12 +223,15 @@ namespace DiscImageChef.Core
DicConsole.Write("{0}", FullTOC.Prettify(toc)); DicConsole.Write("{0}", FullTOC.Prettify(toc));
DicConsole.WriteLine(); DicConsole.WriteLine();
} }
}
if(imageFormat.Info.ReadableMediaTags != null && if(imageFormat.Info.ReadableMediaTags != null &&
imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.CD_PMA)) imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.CD_PMA))
{ {
byte[] pma = imageFormat.ReadDiskTag(MediaTagType.CD_PMA); byte[] pma = imageFormat.ReadDiskTag(MediaTagType.CD_PMA);
if(pma.Length > 0)
{
ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(pma, 0)); ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(pma, 0));
if(dataLen + 2 != pma.Length) if(dataLen + 2 != pma.Length)
{ {
@@ -241,6 +246,7 @@ namespace DiscImageChef.Core
DicConsole.Write("{0}", PMA.Prettify(pma)); DicConsole.Write("{0}", PMA.Prettify(pma));
DicConsole.WriteLine(); DicConsole.WriteLine();
} }
}
if(imageFormat.Info.ReadableMediaTags != null && if(imageFormat.Info.ReadableMediaTags != null &&
imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.CD_ATIP)) imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.CD_ATIP))