Changeset 3099 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

Timestamp:

Jun 12, 2007 4:48:32 PM (17 years ago)

Author:

vboxsync

Message:

Do not use alloca in the guest additions.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -28 +28 @@
 #include <iprt/string.h>
 #include <iprt/assert.h>
-#include <iprt/alloca.h>
 
 /* These functions can be only used by VBoxGuest. */
@@ -128 +127 @@
     VMMDevHGCMCall *pHGCMCall;
     uint32_t cbParms;
+    HGCMFunctionParameter *pParm;
+    unsigned iParm;
     int rc;
 
@@ -146 +147 @@
     if (VBOX_SUCCESS(rc))
     {
-        void **papvCtx = NULL;
+        void *apvCtx[VBOX_HGCM_MAX_PARMS];
+        memset (apvCtx, 0, sizeof (apvCtx));
 
         /* Initialize request memory */
@@ -158 +160 @@
         if (cbParms)
         {
-            HGCMFunctionParameter *pParm;
-
             memcpy (VMMDEV_HGCM_CALL_PARMS(pHGCMCall), VBOXGUEST_HGCM_CALL_PARMS(pCallInfo), cbParms);
             
             /* Lock user buffers. */
-            if (pCallInfo->cParms > 0)
-            {
-                papvCtx = (void **)alloca(pCallInfo->cParms * sizeof (papvCtx[0]));
-                memset (papvCtx, 0, pCallInfo->cParms * sizeof (papvCtx[0]));
-            }
-            
             pParm = VBOXGUEST_HGCM_CALL_PARMS(pCallInfo);
-            unsigned iParm = 0;
-            for (; iParm < pCallInfo->cParms; iParm++, pParm++)
+
+            for (iParm = 0; iParm < pCallInfo->cParms; iParm++, pParm++)
             {
                 if (   pParm->type == VMMDevHGCMParmType_LinAddr_In
@@ -177 +171 @@
                     || pParm->type == VMMDevHGCMParmType_LinAddr)
                 {
-                    rc = vbglLockLinear (&papvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size);
+                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size);
                     
                     if (VBOX_FAILURE (rc))
@@ -240 +234 @@
             
         /* Unlock user buffers. */
-        if (papvCtx != NULL)
-        {
-            HGCMFunctionParameter *pParm = VBOXGUEST_HGCM_CALL_PARMS(pCallInfo);
-            
-            unsigned iParm = 0;
-            for (; iParm < pCallInfo->cParms; iParm++, pParm++)
-            {
-                if (   pParm->type == VMMDevHGCMParmType_LinAddr_In
-                    || pParm->type == VMMDevHGCMParmType_LinAddr_Out
-                    || pParm->type == VMMDevHGCMParmType_LinAddr)
-                {
-                    if (papvCtx[iParm] != NULL)
-                    {
-                        vbglUnlockLinear (papvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size);
-                    }
+        pParm = VBOXGUEST_HGCM_CALL_PARMS(pCallInfo);
+
+        for (iParm = 0; iParm < pCallInfo->cParms; iParm++, pParm++)
+        {
+            if (   pParm->type == VMMDevHGCMParmType_LinAddr_In
+                || pParm->type == VMMDevHGCMParmType_LinAddr_Out
+                || pParm->type == VMMDevHGCMParmType_LinAddr)
+            {
+                if (apvCtx[iParm] != NULL)
+                {
+                    vbglUnlockLinear (apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size);
                 }
             }