X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FMem%2FPage.c;fp=MdeModulePkg%2FCore%2FDxe%2FMem%2FPage.c;h=db32d0f940de983898fc5a7a2d22a2eff8c58ea8;hp=853606653cdb568013a93b581fa397fdbcbc44c5;hb=6cf0a677a992a86b117e0b9ff3cff62077a29903;hpb=1ea53108f6c1010a00a828d1d59ea28934025415

diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 853606653c..db32d0f940 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -920,21 +920,22 @@ CoreConvertPagesEx (
         UINT64  EndToClear;
 
         StartToClear = Start;
-        EndToClear   = RangeEnd;
+        EndToClear   = RangeEnd + 1;
         if (PcdGet8 (PcdHeapGuardPropertyMask) & (BIT1|BIT0)) {
           if (IsGuardPage(StartToClear)) {
             StartToClear += EFI_PAGE_SIZE;
           }
-          if (IsGuardPage (EndToClear)) {
+          if (IsGuardPage (EndToClear - 1)) {
             EndToClear -= EFI_PAGE_SIZE;
           }
-          ASSERT (EndToClear > StartToClear);
         }
 
-        DEBUG_CLEAR_MEMORY(
-          (VOID *)(UINTN)StartToClear,
-          (UINTN)(EndToClear - StartToClear + 1)
-          );
+        if (EndToClear > StartToClear) {
+          DEBUG_CLEAR_MEMORY(
+            (VOID *)(UINTN)StartToClear,
+            (UINTN)(EndToClear - StartToClear)
+            );
+        }
       }
     }