Changeset 40898 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Apr 12, 2012 9:07:50 PM (13 years ago)

Author:

vboxsync

Message:

SUPDrv-dtrace.cpp: Don't access pHdr before consulting fZombie, duh.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -206 +206 @@
     AssertPtrReturnVoid(pProv);
     LOG_DTRACE(("supdrvDtPOps_Provide: %p / %p pDtProbeDesc=%p\n", pProv, pProv->TracerData.DTrace.idProvider, pDtProbeDesc));
+    size_t const            cbFnNmBuf    = _4K + _1K;
+    char                   *pszFnNmBuf;
+    uint16_t                idxProv;
+
+    if (pDtProbeDesc)
+        return;  /* We don't generate probes, so never mind these requests. */
+
+    if (pProv->TracerData.DTrace.fZombie)
+        return;
+
+    dtrace_provider_id_t    idProvider   = pProv->TracerData.DTrace.idProvider;
+    AssertPtrReturnVoid(idProvider);
+    
     AssertPtrReturnVoid(pProv->pHdr);
     PVTGPROBELOC            pProbeLoc    = pProv->pHdr->paProbLocs;
@@ -211 +224 @@
     PVTGPROBELOC            pProbeLocEnd = pProv->pHdr->paProbLocsEnd;
     AssertPtrReturnVoid(pProbeLocEnd);
-    dtrace_provider_id_t    idProvider   = pProv->TracerData.DTrace.idProvider;
-    AssertPtrReturnVoid(idProvider);
-    size_t const            cbFnNmBuf    = _4K + _1K;
-    char                   *pszFnNmBuf;
-    uint16_t                idxProv;
-
-    if (pDtProbeDesc)
-        return;  /* We don't generate probes, so never mind these requests. */
-
-    if (pProv->TracerData.DTrace.fZombie)
-        return;
-
     if (pProv->TracerData.DTrace.cProvidedProbes >= (uintptr_t)(pProbeLocEnd - pProbeLoc))
         return;