JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed AccessViolationExeption crash on AMD Radeon RAMDisk (#1423)

Browse Source
This commit is contained in:
Konstantin Budnikov
2024-08-23 15:24:15 +02:00
committed by GitHub
parent 47628460f2
commit 0263346d89
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreHardwareMonitorLib/Hardware/Storage/WindowsStorage.cs
+6 -6
View File
@@ -80,19 +80,19 @@ internal static class WindowsStorage
{
Kernel32.STORAGE_DEVICE_DESCRIPTOR descriptor = Marshal.PtrToStructure<Kernel32.STORAGE_DEVICE_DESCRIPTOR>(descriptorPtr);
Index = index;
Vendor = GetString(descriptorPtr, descriptor.VendorIdOffset);
Product = GetString(descriptorPtr, descriptor.ProductIdOffset);
Revision = GetString(descriptorPtr, descriptor.ProductRevisionOffset);
Serial = GetString(descriptorPtr, descriptor.SerialNumberOffset);
Vendor = GetString(descriptorPtr, descriptor.VendorIdOffset, descriptor.Size);
Product = GetString(descriptorPtr, descriptor.ProductIdOffset, descriptor.Size);
Revision = GetString(descriptorPtr, descriptor.ProductRevisionOffset, descriptor.Size);
Serial = GetString(descriptorPtr, descriptor.SerialNumberOffset, descriptor.Size);
BusType = descriptor.BusType;
Removable = descriptor.RemovableMedia;
RawData = new byte[descriptor.Size];
Marshal.Copy(descriptorPtr, RawData, 0, RawData.Length);
}
private static string GetString(IntPtr descriptorPtr, uint offset)
private static string GetString(IntPtr descriptorPtr, uint offset, uint size)
{
return offset > 0 ? Marshal.PtrToStringAnsi(IntPtr.Add(descriptorPtr, (int)offset))?.Trim() : string.Empty;
return offset > 0 && offset < size ? Marshal.PtrToStringAnsi(IntPtr.Add(descriptorPtr, (int)offset))?.Trim() : string.Empty;
}
}
}