Changeset 53695 in vbox for trunk

Timestamp:

Jan 2, 2015 12:42:16 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: If windows can use standard RTMemAlloc, so can we (doesn't work otherwise). Don't access pHdr before checking fZombie, duh. (r72)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp (modified) (3 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp

@@ -57 +57 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#if !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
-# define HAVE_RTMEMALLOCEX_FEATURES
-#endif
+//#if !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
+//# define HAVE_RTMEMALLOCEX_FEATURES
+//#endif
 
 
@@ -1375 +1375 @@
 {
     PSUPDRVVDTPROVIDERCORE  pProv        = (PSUPDRVVDTPROVIDERCORE)pvProv;
-    PVTGPROBELOC            pProbeLoc    = pProv->pHdr->paProbLocs;
-    PVTGPROBELOC            pProbeLocEnd = pProv->pHdr->paProbLocsEnd;
     dtrace_provider_id_t    idProvider   = pProv->TracerData.DTrace.idProvider;
     size_t const            cbFnNmBuf    = _4K + _1K;
     char                   *pszFnNmBuf;
     uint16_t                idxProv;
+    PVTGPROBELOC            pProbeLoc;
+    PVTGPROBELOC            pProbeLocEnd;
 
     if (pDtProbeDesc)
@@ -1388 +1388 @@
         return;
 
+    AssertPtrReturnVoid(pProv->pHdr);
+    pProbeLoc    = pProv->pHdr->paProbLocs;
+    pProbeLocEnd = pProv->pHdr->paProbLocsEnd;
     if (pProv->TracerData.DTrace.cProvidedProbes >= (uintptr_t)(pProbeLocEnd - pProbeLoc))
         return;