Changeset 19111 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Apr 22, 2009 1:46:32 PM (16 years ago)

Author:

vboxsync

Message:

vboxmod.c: Fixed AssertReturn, must recheck cb.

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (4 diffs)

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -124 +124 @@
     /** HGCM connection ID */
     uint32_t client_id;
-} hgcm_connections[MAX_HGCM_CONNECTIONS] 
+} hgcm_connections[MAX_HGCM_CONNECTIONS]
 =
 {
@@ -442 +442 @@
 
     AssertPtrReturn(ppBuf, -EINVAL);
-    /* Empty buffers are allowed, but then the user pointer should be NULL */
-    AssertReturn(((cb > 0) && VALID_PTR(pUser)) || (pUser == NULL), -EINVAL);
+    /* Empty buffers are allowed, but then the user pointer should be NULL. */
+    AssertReturn((cb > 0 && VALID_PTR(pUser)) || (cb == 0 && pUser == NULL),
+                 -EINVAL);
 
     pBuf = RTMemAlloc(sizeof(*pBuf));
@@ -961 +962 @@
 
     /* Deal with variable size ioctls first. */
-#ifdef DEBUG  /* Only allow random user applications to spam the log in 
+#ifdef DEBUG  /* Only allow random user applications to spam the log in
                * debug additions builds */
     if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_LOG(0))
@@ -1652 +1653 @@
             rcVBox = VbglGRPerform(&infoReq->header);
         }
-        if (   infoReq 
-            && (   RT_FAILURE(rcVBox) 
+        if (   infoReq
+            && (   RT_FAILURE(rcVBox)
                 || RT_FAILURE(infoReq->header.rc)))
         {