Changeset 74452 in vbox for trunk

Timestamp:

Sep 25, 2018 10:16:07 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/ldrPE: Be less uptight about the load config structure when opening an image for validation or debug info. ticketref:17977

File:

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

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

@@ -4191 +4191 @@
     {
         IMAGE_LOAD_CONFIG_DIRECTORY64   Cfg64;
-        uint8_t                         abZeros[sizeof(IMAGE_LOAD_CONFIG_DIRECTORY64_V7) * 4];
+        uint8_t                         abZeros[sizeof(IMAGE_LOAD_CONFIG_DIRECTORY64) * 4];
     } u;
 
@@ -4257 +4257 @@
          * Read, check new stuff and convert to 64-bit.
          *
-         * If we accepted a newer structure, we check whether the new bits are
-         * all zero.  This PRAYING/ASSUMING that the nothing new weird stuff is
-         * activated by a zero value and that it'll mostly be unused in areas
-         * we care about (which has been the case till now).
+         * If we accepted a newer structures when loading for debug or validation,
+         * otherwise we require the new bits to be all zero and hope that they are
+         * insignificant where image loading is concerned (that's mostly been the
+         * case even for non-zero bits, only hard exception is LockPrefixTable).
          */
         RT_ZERO(u.Cfg64);
@@ -4268 +4268 @@
         if (   fNewerStructureHack
             && Dir.Size > cbMaxKnown
+            && !(fFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION))
             && !ASMMemIsZero(&u.abZeros[cbMaxKnown], Dir.Size - cbMaxKnown))
         {