Changeset 95638 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Jul 14, 2022 2:44:12 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/ldrPE: Tested and fixed the page hash generation code. bugref:8691

File:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -2475 +2475 @@
         for (uint32_t iPage = 0; iPage < cPagesInSection; iPage++)
         {
-            uint32_t const offPageInFile = offRawData + iPage * cbPage;
-            uint32_t const cbPageInFile  = RT_MIN(cbPage, offPageInFile - cbRawData);
+            uint32_t const offPageInSect = iPage * cbPage;
+            uint32_t const offPageInFile = offRawData + offPageInSect;
+            uint32_t const cbPageInFile  = RT_MIN(cbPage, cbRawData - offPageInSect);
             offLastPage = offPageInFile;
 
@@ -2578 +2579 @@
      * Add the terminator entry.
      */
-    *(uint32_t *)pbDst = offLastPage;
+    *(uint32_t *)pbDst = offLastPage + cbPage;
     RT_BZERO(&pbDst[sizeof(uint32_t)], cbHash);