OcSmbiosLib: Provide fallbacks for NULL memory SMBIOS strings

This commit is contained in:
Goldfish64 2020-10-10 09:27:41 -05:00
parent 4b8ab02bc9
commit 6ca34fe0c2
2 changed files with 9 additions and 4 deletions

View File

@ -3,6 +3,7 @@ OpenCore Changelog
#### v0.6.3
- Added support for xml comments in plist files
- Updated underlying EDK II package to edk2-stable202008
- Provide fallbacks for NULL memory SMBIOS strings
#### v0.6.2
- Updated builtin firmware versions for SMBIOS and the rest

View File

@ -696,10 +696,14 @@ PatchMemoryDevice (
Table->CurrentPtr.Standard.Type17->MemoryErrorInformationHandle = 0xFFFF;
}
SMBIOS_OVERRIDE_S (Table, Standard.Type17->Manufacturer, Original, NULL, &StringIndex, NULL);
SMBIOS_OVERRIDE_S (Table, Standard.Type17->SerialNumber, Original, NULL, &StringIndex, NULL);
SMBIOS_OVERRIDE_S (Table, Standard.Type17->AssetTag, Original, NULL, &StringIndex, NULL);
SMBIOS_OVERRIDE_S (Table, Standard.Type17->PartNumber, Original, NULL, &StringIndex, NULL);
//
// Some machines may have NULL values for these fields, which will cause SPMemoryReporter
// crashes or ??? to be displayed in About This Mac. Fallback to "Unknown" for such fields.
//
SMBIOS_OVERRIDE_S (Table, Standard.Type17->Manufacturer, Original, NULL, &StringIndex, "Unknown");
SMBIOS_OVERRIDE_S (Table, Standard.Type17->SerialNumber, Original, NULL, &StringIndex, "Unknown");
SMBIOS_OVERRIDE_S (Table, Standard.Type17->AssetTag, Original, NULL, &StringIndex, "Unknown");
SMBIOS_OVERRIDE_S (Table, Standard.Type17->PartNumber, Original, NULL, &StringIndex, "Unknown");
SMBIOS_OVERRIDE_V (Table, Standard.Type17->Attributes, Original, NULL, NULL);
SMBIOS_OVERRIDE_V (Table, Standard.Type17->ExtendedSize, Original, NULL, NULL);