diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c index 24afa1f2d2..943c4eba04 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c @@ -126,7 +126,8 @@ SerialStatusCodeReportWorker ( Value, Instance ); - } else if (CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) && + } else if (Data != NULL && + CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) && ((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) { // // EFI_STATUS_CODE_STRING_DATA diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c index 2bba8b64f5..c18cc8b80b 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c @@ -124,7 +124,8 @@ SerialStatusCodeReportWorker ( Value, Instance ); - } else if (CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) && + } else if (Data != NULL && + CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) && ((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) { // // EFI_STATUS_CODE_STRING_DATA