Merge e2f5642 into 4d63170

x64dbg · May 2, 2024 · e1eb85a · e1eb85a
2 parents 4d63170 + e2f5642
commit e1eb85a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/dbg/memory.cpp b/src/dbg/memory.cpp
@@ -258,6 +258,17 @@ static void ProcessFileSections(std::vector<MEMPAGE> & pageVector, std::vector<S
             for(const auto & page : newPages)
                 totalSize += page.mbi.RegionSize;
 
+            if(totalSize < pageSize)
+            {
+                // On Windows 11 24H2+, modules that support hotpatching contain an extra page mapped into their image region
+                MEMPAGE imageExtensionPage = {};
+                imageExtensionPage.mbi.BaseAddress = (PVOID)(pageBase + totalSize);
+                imageExtensionPage.mbi.RegionSize = pageSize - totalSize;
+                sprintf_s(imageExtensionPage.info, "ImageExtension");
+                newPages.push_back(imageExtensionPage);
+                totalSize = pageSize;
+            }
+
             // Replace the single module page with the sections
             // newPages should never be empty, but try to avoid data loss if it is
             if(!newPages.empty() && totalSize == pageSize)