Changeset 85678 in vbox for trunk/src

Timestamp:

Aug 10, 2020 8:18:04 PM (4 years ago)

Author:

vboxsync

Message:

IPRT/ldrMachO.cpp: Fix SegInfo.cbMapping nil value and checking for unmapped segments to make tstLdr-4 happy. bugref:9801

File:

• trunk/src/VBox/Runtime/common/ldr/ldrMachO.cpp (modified) (6 diffs)

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

@@ -1552 +1552 @@
                 cSegmentsToAdjust--;
                 pThis->aSegments[cSegmentsToAdjust].SegInfo.RVA = NIL_RTLDRADDR;
-                pThis->aSegments[cSegmentsToAdjust].SegInfo.cbMapped = 0;
+                pThis->aSegments[cSegmentsToAdjust].SegInfo.cbMapped = NIL_RTLDRADDR;
                 continue;
             }
@@ -1564 +1564 @@
             {
                 cSegmentsToAdjust--;
-                pThis->aSegments[cSegmentsToAdjust].SegInfo.RVA = NIL_RTLDRADDR;
-                pThis->aSegments[cSegmentsToAdjust].SegInfo.cbMapped = 0;
+                pThis->aSegments[cSegmentsToAdjust].SegInfo.RVA      = NIL_RTLDRADDR;
+                pThis->aSegments[cSegmentsToAdjust].SegInfo.cbMapped = NIL_RTLDRADDR;
                 continue;
             }
@@ -4459 +4459 @@
     uint32_t const cSegments  = pThis->cSegments;
     for (uint32_t iSeg = 0; iSeg < cSegments; iSeg++)
-    {
-        RTLDRADDR offSeg = LinkAddress - pThis->aSegments[iSeg].SegInfo.LinkAddress;
-        if (   offSeg < pThis->aSegments[iSeg].SegInfo.cbMapped
-            || offSeg < pThis->aSegments[iSeg].SegInfo.cb)
-        {
-            *piSeg = iSeg;
-            *poffSeg = offSeg;
-            return VINF_SUCCESS;
-        }
-    }
+        if (pThis->aSegments[iSeg].SegInfo.RVA != NIL_RTLDRADDR)
+        {
+            Assert(pThis->aSegments[iSeg].SegInfo.cbMapped != NIL_RTLDRADDR);
+            RTLDRADDR offSeg = LinkAddress - pThis->aSegments[iSeg].SegInfo.LinkAddress;
+            if (   offSeg < pThis->aSegments[iSeg].SegInfo.cbMapped
+                || offSeg < pThis->aSegments[iSeg].SegInfo.cb)
+            {
+                *piSeg = iSeg;
+                *poffSeg = offSeg;
+                return VINF_SUCCESS;
+            }
+        }
 
     return VERR_LDR_INVALID_LINK_ADDRESS;
@@ -4482 +4484 @@
     uint32_t const cSegments  = pThis->cSegments;
     for (uint32_t iSeg = 0; iSeg < cSegments; iSeg++)
-    {
-        RTLDRADDR offSeg = LinkAddress - pThis->aSegments[iSeg].SegInfo.LinkAddress;
-        if (   offSeg < pThis->aSegments[iSeg].SegInfo.cbMapped
-            || offSeg < pThis->aSegments[iSeg].SegInfo.cb)
-        {
-            *pRva = pThis->aSegments[iSeg].SegInfo.RVA + offSeg;
-            return VINF_SUCCESS;
-        }
-    }
+        if (pThis->aSegments[iSeg].SegInfo.RVA != NIL_RTLDRADDR)
+        {
+            Assert(pThis->aSegments[iSeg].SegInfo.cbMapped != NIL_RTLDRADDR);
+            RTLDRADDR offSeg = LinkAddress - pThis->aSegments[iSeg].SegInfo.LinkAddress;
+            if (   offSeg < pThis->aSegments[iSeg].SegInfo.cbMapped
+                || offSeg < pThis->aSegments[iSeg].SegInfo.cb)
+            {
+                *pRva = pThis->aSegments[iSeg].SegInfo.RVA + offSeg;
+                return VINF_SUCCESS;
+            }
+        }
 
     return VERR_LDR_INVALID_RVA;
@@ -4506 +4510 @@
         return VERR_LDR_INVALID_SEG_OFFSET;
     RTLDRMODMACHOSEG const *pSegment = &pThis->aSegments[iSeg];
+
+    if (pSegment->SegInfo.RVA == NIL_RTLDRADDR)
+        return VERR_LDR_INVALID_SEG_OFFSET;
 
     if (   offSeg > pSegment->SegInfo.cbMapped
@@ -4526 +4533 @@
     uint32_t const cSegments  = pThis->cSegments;
     for (uint32_t iSeg = 0; iSeg < cSegments; iSeg++)
-    {
-        RTLDRADDR offSeg = Rva - pThis->aSegments[iSeg].SegInfo.RVA;
-        if (   offSeg < pThis->aSegments[iSeg].SegInfo.cbMapped
-            || offSeg < pThis->aSegments[iSeg].SegInfo.cb)
-        {
-            *piSeg = iSeg;
-            *poffSeg = offSeg;
-            return VINF_SUCCESS;
-        }
-    }
+        if (pThis->aSegments[iSeg].SegInfo.RVA != NIL_RTLDRADDR)
+        {
+            Assert(pThis->aSegments[iSeg].SegInfo.cbMapped != NIL_RTLDRADDR);
+            RTLDRADDR offSeg = Rva - pThis->aSegments[iSeg].SegInfo.RVA;
+            if (   offSeg < pThis->aSegments[iSeg].SegInfo.cbMapped
+                || offSeg < pThis->aSegments[iSeg].SegInfo.cb)
+            {
+                *piSeg = iSeg;
+                *poffSeg = offSeg;
+                return VINF_SUCCESS;
+            }
+        }
 
     return VERR_LDR_INVALID_RVA;