Changeset 41192 in vbox

Timestamp:

May 7, 2012 4:52:45 PM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl/VbglR3: Use fixed HGCM parameter counts, assertions.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (7 diffs)

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

@@ -177 +177 @@
                                                   uint32_t *pcMsTimeLimit)
 {
-    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszCmd, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puFlags, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszArgs, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcArgs, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszEnv, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcbEnv, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcEnvVars, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszUser, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszPassword, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcMsTimeLimit, VERR_INVALID_PARAMETER);
+    AssertReturn(cParms == 11, VERR_INVALID_PARAMETER);
+
+    AssertPtrReturn(puContext, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszCmd, VERR_INVALID_POINTER);
+    AssertPtrReturn(puFlags, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszArgs, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcArgs, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszEnv, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcbEnv, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcEnvVars, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszPassword, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcMsTimeLimit, VERR_INVALID_POINTER);
 
     VBoxGuestCtrlHGCMMsgExecCmd Msg;
@@ -194 +196 @@
     Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
-    Msg.hdr.cParms      = cParms; /** @todo r=bird: This isn't safe/right. The parameter count of this HGCM call
-                                   * is fixed from our point of view. */
+    Msg.hdr.cParms      = 11;
 
     VbglHGCMParmUInt32Set(&Msg.context, 0);
@@ -245 +246 @@
                                                     uint32_t *puHandle,       uint32_t *puFlags)
 {
-    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puPID, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puHandle, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puFlags, VERR_INVALID_PARAMETER);
+    AssertReturn(cParms == 4, VERR_INVALID_PARAMETER);
+
+    AssertPtrReturn(puContext, VERR_INVALID_POINTER);
+    AssertPtrReturn(puPID, VERR_INVALID_POINTER);
+    AssertPtrReturn(puHandle, VERR_INVALID_POINTER);
+    AssertPtrReturn(puFlags, VERR_INVALID_POINTER);
 
     VBoxGuestCtrlHGCMMsgExecOut Msg;
@@ -255 +258 @@
     Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
-    Msg.hdr.cParms = cParms;
+    Msg.hdr.cParms = 4;
 
     VbglHGCMParmUInt32Set(&Msg.context, 0);
@@ -299 +302 @@
                                                    uint32_t *pcbSize)
 {
-    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puPID, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puFlags, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pvData, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcbSize, VERR_INVALID_PARAMETER);
+    AssertReturn(cParms == 5, VERR_INVALID_PARAMETER);
+
+    AssertPtrReturn(puContext, VERR_INVALID_POINTER);
+    AssertPtrReturn(puPID, VERR_INVALID_POINTER);
+    AssertPtrReturn(puFlags, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvData, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcbSize, VERR_INVALID_POINTER);
 
     VBoxGuestCtrlHGCMMsgExecIn Msg;
@@ -310 +315 @@
     Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
-    Msg.hdr.cParms      = cParms;
+    Msg.hdr.cParms      = 5;
 
     VbglHGCMParmUInt32Set(&Msg.context, 0);
@@ -449 +454 @@
     return rc;
 }
+