Changeset 73387 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

Timestamp:

Jul 27, 2018 3:20:00 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124005

Message:

RTLdrQueryPropEx: RTLDRPROP_UNWIND_TABLE and RTLDRPROP_UNWIND_INFO for getting PE unwind info.

File:

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

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

@@ -472 +472 @@
     RTMemFree((void *)pvMem);
 }
+
+
+/**
+ * Reads a section of a PE image given by RVA + size.
+ *
+ * @returns IPRT status code.
+ * @param   pThis               Pointer to the PE loader module structure.
+ * @param   pvBits              Read only bits if available. NULL if not.
+ * @param   uRva                The RVA to read at.
+ * @param   cbMem               The number of bytes to read.
+ * @param   pvDst               The destination buffer.
+ */
+static int rtldrPEReadPartByRvaInfoBuf(PRTLDRMODPE pThis, const void *pvBits, uint32_t uRva, uint32_t cbMem, void *pvDst)
+{
+    /** @todo consider optimizing this.   */
+    const void *pvSrc = NULL;
+    int rc = rtldrPEReadPartByRva(pThis, pvBits, uRva, cbMem, &pvSrc);
+    if (RT_SUCCESS(rc))
+    {
+        memcpy(pvDst, pvSrc, cbMem);
+        rtldrPEFreePart(pThis, NULL, pvSrc);
+    }
+    return rc;
+}
+
+
+
 
 
@@ -1962 +1989 @@
  *                          (or in case of VERR_BUFFER_OVERFLOW would have).
  */
-static int rtLdrPE_QueryUnwindInfo(PRTLDRMODPE pThis, void const *pvBits, void *pvBuf, size_t cbBuf, size_t *pcbRet)
+static int rtLdrPE_QueryUnwindTable(PRTLDRMODPE pThis, void const *pvBits, void *pvBuf, size_t cbBuf, size_t *pcbRet)
 {
     int rc;
@@ -1971 +1998 @@
         *pcbRet = cbSrc;
         if (cbBuf >= cbSrc)
-        {
-            void const *pvSrc = NULL;
-            rc = rtldrPEReadPartByRva(pThis, pvBits, pThis->ExceptionDir.VirtualAddress, cbSrc, &pvSrc);
-            if (RT_SUCCESS(rc))
-            {
-                memcpy(pvBuf, pvSrc, cbSrc);
-                rtldrPEFreePart(pThis, pvBits, pvSrc);
-            }
-        }
+            rc = rtldrPEReadPartByRvaInfoBuf(pThis, pvBits, pThis->ExceptionDir.VirtualAddress, cbSrc, pvBuf);
         else
             rc = VERR_BUFFER_OVERFLOW;
@@ -2062 +2081 @@
             return rtLdrPE_QueryInternalName(pModPe, pvBits, pvBuf, cbBuf, pcbRet);
 
+        case RTLDRPROP_UNWIND_TABLE:
+            return rtLdrPE_QueryUnwindTable(pModPe, pvBits, pvBuf, cbBuf, pcbRet);
+
         case RTLDRPROP_UNWIND_INFO:
-            return rtLdrPE_QueryUnwindInfo(pModPe, pvBits, pvBuf, cbBuf, pcbRet);
+        {
+            uint32_t uRva = *(uint32_t const *)pvBuf;
+            if (uRva < pModPe->cbImage)
+            {
+                uint32_t cbLeft   = pModPe->cbImage - uRva;
+                uint32_t cbToRead = (uint32_t)RT_MIN(cbLeft, cbBuf);
+                *pcbRet = cbToRead;
+                return rtldrPEReadPartByRvaInfoBuf(pModPe, pvBits, uRva, cbToRead, pvBuf);
+            }
+            *pcbRet = 0;
+            return VINF_SUCCESS;
+        }
 
         default: