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 trying to save null media tags, and report their presence to stderror.

Browse Source
This commit is contained in:
Natalia Portillo
2019-08-10 14:35:14 +01:00
parent 298ac5969f
commit 44c96f1c04
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DiscImageChef.Core/Devices/Dumping/ATA.cs
View File

@@ -539,7 +539,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar = preSidecar; sidecar = preSidecar;
} }
if(dev.IsUsb) if(dev.IsUsb && dev.UsbDescriptors != null)
{ {
dumpLog.WriteLine("Reading USB descriptors."); dumpLog.WriteLine("Reading USB descriptors.");
UpdateStatus?.Invoke("Reading USB descriptors."); UpdateStatus?.Invoke("Reading USB descriptors.");
@@ -559,7 +559,7 @@ namespace DiscImageChef.Core.Devices.Dumping
}; };
} }
if(dev.IsPcmcia) if(dev.IsPcmcia && dev.Cis != null)
{ {
dumpLog.WriteLine("Reading PCMCIA CIS."); dumpLog.WriteLine("Reading PCMCIA CIS.");
UpdateStatus?.Invoke("Reading PCMCIA CIS."); UpdateStatus?.Invoke("Reading PCMCIA CIS.");

8
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -1801,6 +1801,12 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!aborted) if(!aborted)
foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags) foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
{ {
if(tag.Value is null)
{
DicConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
continue;
}
ret = outputPlugin.WriteMediaTag(tag.Value, tag.Key); ret = outputPlugin.WriteMediaTag(tag.Value, tag.Key);
if(ret || force) continue; if(ret || force) continue;
@@ -1873,7 +1879,7 @@ namespace DiscImageChef.Core.Devices.Dumping
from partition in xmlTrack.FileSystemInformation from partition in xmlTrack.FileSystemInformation
where partition.FileSystems != null where partition.FileSystems != null
from fileSystem in partition.FileSystems from fileSystem in partition.FileSystems
select ((ulong)partition.StartSector, fileSystem.Type)); select (partition.StartSector, fileSystem.Type));
if(filesystems.Count > 0) if(filesystems.Count > 0)
foreach(var filesystem in filesystems.Select(o => new {o.start, o.type}).Distinct()) foreach(var filesystem in filesystems.Select(o => new {o.start, o.type}).Distinct())

8
DiscImageChef.Core/Devices/Dumping/SBC.cs
View File

@@ -684,6 +684,12 @@ namespace DiscImageChef.Core.Devices.Dumping
if(opticalDisc) if(opticalDisc)
foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags) foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
{ {
if(tag.Value is null)
{
DicConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
continue;
}
ret = outputPlugin.WriteMediaTag(tag.Value, tag.Key); ret = outputPlugin.WriteMediaTag(tag.Value, tag.Key);
if(ret || force) continue; if(ret || force) continue;
@@ -698,7 +704,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
if(!dev.IsRemovable || dev.IsUsb) if(!dev.IsRemovable || dev.IsUsb)
{ {
if(dev.IsUsb) if(dev.IsUsb && dev.UsbDescriptors != null)
{ {
UpdateStatus?.Invoke("Reading USB descriptors."); UpdateStatus?.Invoke("Reading USB descriptors.");
dumpLog.WriteLine("Reading USB descriptors."); dumpLog.WriteLine("Reading USB descriptors.");

6
DiscImageChef.Core/Devices/Dumping/XGD.cs
View File

@@ -883,6 +883,12 @@ namespace DiscImageChef.Core.Devices.Dumping
foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags) foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
{ {
if(tag.Value is null)
{
DicConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
continue;
}
ret = outputPlugin.WriteMediaTag(tag.Value, tag.Key); ret = outputPlugin.WriteMediaTag(tag.Value, tag.Key);
if(ret || force) continue; if(ret || force) continue;

7
DiscImageChef.DiscImages/DiscImageChef/Write.cs
View File

@@ -1612,6 +1612,13 @@ namespace DiscImageChef.DiscImages
foreach(KeyValuePair<MediaTagType, byte[]> mediaTag in mediaTags) foreach(KeyValuePair<MediaTagType, byte[]> mediaTag in mediaTags)
{ {
DataType dataType = GetDataTypeForMediaTag(mediaTag.Key); DataType dataType = GetDataTypeForMediaTag(mediaTag.Key);
if(mediaTag.Value is null)
{
DicConsole.ErrorWriteLine("Tag type {0} is null, skipping...", dataType);
continue;
}
idxEntry = new IndexEntry idxEntry = new IndexEntry
{ {
blockType = BlockType.DataBlock, dataType = dataType, offset = (ulong)imageStream.Position blockType = BlockType.DataBlock, dataType = dataType, offset = (ulong)imageStream.Position