Changeset 44247 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jan 8, 2013 9:03:31 AM (12 years ago)

Author:

vboxsync

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

83104

Message:

SUPDrvTracer.cpp: Fixed crash on Mac OS X Snow Leopard where pszFunction wouldn't be fixed (just like pProbe). Fixes public ticket #11273.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp

@@ -636 +636 @@
             MY_CHECK_RET(paProbeLocs[i].fEnabled == false, VERR_SUPDRV_VTG_BAD_PROBE_LOC);
             MY_CHECK_RET(paProbeLocs[i].idProbe == 0, VERR_SUPDRV_VTG_BAD_PROBE_LOC);
-            MY_WITHIN_IMAGE(paProbeLocs[i].pszFunction, VERR_SUPDRV_VTG_BAD_PROBE_LOC);
             offTmp = (uintptr_t)paProbeLocs[i].pProbe - (uintptr_t)pVtgHdr->offProbes - (uintptr_t)pVtgHdr;
 #ifdef RT_OS_DARWIN /* See header validation code. */
@@ -646 +645 @@
             {
                 uint64_t offDelta = uVtgHdrAddr - pVtgHdr->u64VtgObjSectionStart;
+
                 paProbeLocs[i].pProbe = (PVTGDESCPROBE)((uintptr_t)paProbeLocs[i].pProbe + offDelta);
+                if ((uintptr_t)paProbeLocs[i].pszFunction < _4M)
+                    paProbeLocs[i].pszFunction = (const char *)((uintptr_t)paProbeLocs[i].pszFunction + offDelta);
+
                 offTmp += offDelta;
             }
@@ -652 +655 @@
             MY_CHECK_RET(offTmp < pVtgHdr->cbProbes, VERR_SUPDRV_VTG_BAD_PROBE_LOC);
             MY_CHECK_RET(offTmp / sizeof(VTGDESCPROBE) * sizeof(VTGDESCPROBE) == offTmp, VERR_SUPDRV_VTG_BAD_PROBE_LOC);
+            MY_WITHIN_IMAGE(paProbeLocs[i].pszFunction, VERR_SUPDRV_VTG_BAD_PROBE_LOC);
         }
     }