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

Better guards against certaing EVPD page 80h.

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-17 15:38:44 +01:00
parent 71f24efc49
commit ae6fe033c2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Aaru.Decoders/SCSI/EVPD.cs
View File

@@ -100,6 +100,8 @@ public static class EVPD
for(int i = 0; i < ascii.Length - 1; i++) for(int i = 0; i < ascii.Length - 1; i++)
{ {
if(ascii[i] == 0x00) break;
if(ascii[i] < 0x20) return null; if(ascii[i] < 0x20) return null;
} }
@@ -553,9 +555,11 @@ public static class EVPD
break; break;
case IdentificationTypes.EUI: case IdentificationTypes.EUI:
if(descriptor.CodeSet is IdentificationCodeSet.ASCII or IdentificationCodeSet.UTF8) if(descriptor.CodeSet is IdentificationCodeSet.ASCII or IdentificationCodeSet.UTF8)
{
sb.AppendFormat($"\t[slateblue1]{Localization.IEEE_EUI_64_0}[/]", sb.AppendFormat($"\t[slateblue1]{Localization.IEEE_EUI_64_0}[/]",
$"[teal]{Markup.Escape(descriptor.ASCII)}[/]") $"[teal]{Markup.Escape(descriptor.ASCII)}[/]")
.AppendLine(); .AppendLine();
}
else else
{ {
sb.AppendFormat($"\t[slateblue1]{Localization.IEEE_EUI_64_0_X2}", sb.AppendFormat($"\t[slateblue1]{Localization.IEEE_EUI_64_0_X2}",
@@ -569,9 +573,11 @@ public static class EVPD
break; break;
case IdentificationTypes.NAA: case IdentificationTypes.NAA:
if(descriptor.CodeSet is IdentificationCodeSet.ASCII or IdentificationCodeSet.UTF8) if(descriptor.CodeSet is IdentificationCodeSet.ASCII or IdentificationCodeSet.UTF8)
{
sb.AppendFormat($"\t[slateblue1]{Localization.NAA_0}[/]", sb.AppendFormat($"\t[slateblue1]{Localization.NAA_0}[/]",
$"[teal]{Markup.Escape(descriptor.ASCII)}[/]") $"[teal]{Markup.Escape(descriptor.ASCII)}[/]")
.AppendLine(); .AppendLine();
}
else else
{ {
sb.AppendFormat($"\t[slateblue1]{Localization.NAA_0_X2}", $"[teal]{descriptor.Binary[0]}"); sb.AppendFormat($"\t[slateblue1]{Localization.NAA_0_X2}", $"[teal]{descriptor.Binary[0]}");
@@ -600,9 +606,11 @@ public static class EVPD
break; break;
case IdentificationTypes.TargetPortGroup: case IdentificationTypes.TargetPortGroup:
if(descriptor.CodeSet is IdentificationCodeSet.ASCII or IdentificationCodeSet.UTF8) if(descriptor.CodeSet is IdentificationCodeSet.ASCII or IdentificationCodeSet.UTF8)
{
sb.AppendFormat($"\t[slateblue1]{Localization.Target_group_identifier_0}[/]", sb.AppendFormat($"\t[slateblue1]{Localization.Target_group_identifier_0}[/]",
$"[teal]{Markup.Escape(descriptor.ASCII)}[/]") $"[teal]{Markup.Escape(descriptor.ASCII)}[/]")
.AppendLine(); .AppendLine();
}
else else
{ {
sb.AppendFormat("\t[slateblue1]{ Localization.Target_group_identifier_0}[/]", sb.AppendFormat("\t[slateblue1]{ Localization.Target_group_identifier_0}[/]",