mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-08-31 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added additional checks to SMBIOS parsing. New class HexStringArray is for debugging with report data.

Browse Source
This commit is contained in:
Michael Möller
2010-01-29 20:05:32 +00:00
parent 7a48707225
commit cb0a64e90c
5 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Hardware/SMBIOS/SMBIOSGroup.cs
View File

@@ -144,6 +144,14 @@ namespace OpenHardwareMonitor.Hardware.SMBIOS {
private byte[] data;
private string[] strings;
protected string GetString(int offset) {
if (offset < data.Length && data[offset] > 0 &&
data[offset] <= strings.Length)
return strings[data[offset] - 1];
else
return "";
}
public Structure(byte type, ushort handle, byte[] data, string[] strings)
{
this.type = type;
@@ -159,18 +167,15 @@ namespace OpenHardwareMonitor.Hardware.SMBIOS {
public class BIOSInformation : Structure {
private string vendor = "";
private string version = "";
private string vendor;
private string version;
public BIOSInformation(byte type, ushort handle, byte[] data,
string[] strings)
: base(type, handle, data, strings) {
if (data[0x04] > 0 && data[0x04] <= strings.Length)
vendor = strings[data[0x04] - 1];
if (data[0x05] > 0 && data[0x05] <= strings.Length)
version = strings[data[0x05] - 1];
this.vendor = GetString(0x04);
this.version = GetString(0x05);
}
public string Vendor { get { return vendor; } }
@@ -180,18 +185,15 @@ namespace OpenHardwareMonitor.Hardware.SMBIOS {
public class BaseBoardInformation : Structure {
private string manufacturer = "";
private string productName = "";
private string manufacturer;
private string productName;
public BaseBoardInformation(byte type, ushort handle, byte[] data,
string[] strings)
: base(type, handle, data, strings) {
if (data[0x04] > 0 && data[0x04] <= strings.Length)
manufacturer = strings[data[0x04] - 1];
if (data[0x05] > 0 && data[0x05] <= strings.Length)
productName = strings[data[0x05] - 1];
this.manufacturer = GetString(0x04);
this.productName = GetString(0x05);
}
public string Manufacturer { get { return manufacturer; } }