X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FSec%2FSecMain.c;h=26f10c4e05b2a9a6d1d270bc05fac39a9d7d9c4f;hp=2c3d08e06280030c510ff2ad0455124e73665eb1;hb=4b8a7ba9c532ecd918f9ac2e0f18c73ca8316f4c;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/EdkNt32Pkg/Sec/SecMain.c b/EdkNt32Pkg/Sec/SecMain.c
index 2c3d08e062..26f10c4e05 100644
--- a/EdkNt32Pkg/Sec/SecMain.c
+++ b/EdkNt32Pkg/Sec/SecMain.c
@@ -159,8 +159,8 @@ Returns:
   CHAR16                *MemorySizeStr;
   CHAR16                *FirmwareVolumesStr;
 
-  MemorySizeStr      = (CHAR16 *)FixedPcdGetPtr (PcdWinNtMemorySize);
-  FirmwareVolumesStr = (CHAR16 *)FixedPcdGetPtr (PcdWinNtFirmwareVolume);
+  MemorySizeStr      = (CHAR16 *)PcdGetPtr (PcdWinNtMemorySizeForSecMain);
+  FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdWinNtFirmwareVolume);
 
   printf ("\nEDK SEC Main NT Emulation Environment from www.TianoCore.org\n");
 
@@ -473,24 +473,30 @@ Returns:
     // The first 12 * UINT64 bytes of the string are really an
     // arguement stack to support varargs on the Format string.
     //
-    DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
-    Marker    = (VA_LIST) (DebugInfo + 1);
-    Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);
+    if (Data != NULL) {
+      DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
+      Marker    = (VA_LIST) (DebugInfo + 1);
+      Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);
 
-    AsciiVSPrint (PrintBuffer, BYTES_PER_RECORD, Format, Marker);
-    printf (PrintBuffer);
+      AsciiVSPrint (PrintBuffer, BYTES_PER_RECORD, Format, Marker);
+      printf (PrintBuffer);
+    } else {
+      printf ("DEBUG <null>\n");
+    }
   }
 
   if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) &&
       ((CodeType & EFI_STATUS_CODE_SEVERITY_MASK) == EFI_ERROR_UNRECOVERED)
       ) {
-    if (ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {
+    if (Data != NULL && ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {
       //
       // Support ASSERT () macro
       //
       printf ("ASSERT %s(%d): %s\n", Filename, LineNumber, Description);
-      CpuBreakpoint ();
+    } else {
+      printf ("ASSERT <null>\n");
     }
+    CpuBreakpoint ();
   }
 
   return EFI_SUCCESS;