diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c index e009999fbd..c6461f5547 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c @@ -806,7 +806,7 @@ EnableNullDetection ( if (((PcdGet8 (PcdNullPointerDetectionPropertyMask) & BIT0) == 0) || - ((mEndOfDxe == TRUE) && + ((mEndOfDxe) && ((PcdGet8 (PcdNullPointerDetectionPropertyMask) & (BIT7|BIT0)) == (BIT7|BIT0))) ) { @@ -856,7 +856,7 @@ DisableNullDetection ( if (((PcdGet8 (PcdNullPointerDetectionPropertyMask) & BIT0) == 0) || - ((mEndOfDxe == TRUE) && + ((mEndOfDxe) && ((PcdGet8 (PcdNullPointerDetectionPropertyMask) & (BIT7|BIT0)) == (BIT7|BIT0))) ) {