Changeset 53692 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Jan 2, 2015 12:41:52 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: dtps_getargdesc fixes (r69)

File:

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

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

@@ -1530 +1530 @@
     PSUPDRVVDTPROVIDERCORE  pProv  = (PSUPDRVVDTPROVIDERCORE)pvProv;
     unsigned                uArg   = pArgDesc->dtargd_ndx;
+    pArgDesc->dtargd_ndx = DTRACE_ARGNONE;
 
     if (!pProv->TracerData.DTrace.fZombie)
@@ -1537 +1538 @@
         PVTGDESCARGLIST pArgList   = (PVTGDESCARGLIST)((uintptr_t)pProv->pHdr->paArgLists + pProbeDesc->offArgList);
 
-        Assert(pProbeDesc->offArgList < pProv->pHdr->cbArgLists);
-        if (pArgList->cArgs > uArg)
+        AssertReturnVoid(pProbeDesc->offArgList < pProv->pHdr->cbArgLists);
+        if (uArg < pArgList->cArgs)
         {
             const char *pszType = vboxDtVtgGetString(pProv->pHdr, pArgList->aArgs[uArg].offType);
@@ -1545 +1546 @@
             {
                 memcpy(pArgDesc->dtargd_native, pszType, cchType + 1);
-                /** @todo mapping */
+                pArgDesc->dtargd_ndx = uArg;
+                /** @todo mapping? */
                 return;
             }
@@ -1551 +1553 @@
     }
 
-    pArgDesc->dtargd_ndx = DTRACE_ARGNONE;
 }