Changeset 3432 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jul 5, 2007 8:14:18 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22642

Message:

Fixed issue with NULL parameter passing

File:

• trunk/src/VBox/HostServices/SharedOpenGL/service.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/service.cpp

@@ -210 +210 @@
             if (    paParms[0].type != VBOX_HGCM_SVC_PARM_PTR       /* pCmdBuffer */
                 ||  paParms[1].type != VBOX_HGCM_SVC_PARM_32BIT     /* cCommands */
-                ||  paParms[2].type != VBOX_HGCM_SVC_PARM_PTR       /* pLastParam */
+                ||  (    paParms[2].type != VBOX_HGCM_SVC_PARM_PTR       /* pLastParam */
+                     &&  paParms[2].type != VBOX_HGCM_SVC_PARM_32BIT)    /* pLastParam if NULL */
                 ||  paParms[3].type != VBOX_HGCM_SVC_PARM_64BIT     /* retval */
                 ||  paParms[4].type != VBOX_HGCM_SVC_PARM_32BIT     /* lasterror */
@@ -227 +228 @@
 
                 /* Save the last parameter of the last command in the client structure so the macro can pick it up there */
-                pClient->pLastParam  = (uint8_t *)paParms[2].u.pointer.addr;
-                pClient->cbLastParam = paParms[2].u.pointer.size;
+                if (paParms[2].type == VBOX_HGCM_SVC_PARM_32BIT)
+                {
+                    pClient->pLastParam  = NULL;
+                    pClient->cbLastParam = 0;
+                }
+                else
+                {
+                    pClient->pLastParam  = (uint8_t *)paParms[2].u.pointer.addr;
+                    pClient->cbLastParam = paParms[2].u.pointer.size;
+                }
 
                 /* Execute the function. */