Changeset 47300 in vbox

Timestamp:

Jul 22, 2013 2:04:31 PM (11 years ago)

Author:

vboxsync

Message:

VMMDev/ReportGuestUserState: Bugfixes.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -682 +682 @@
         }
 
-        pThis->pDrv->pfnUpdateGuestUserState(pThis->pDrv,
-                                             /* User name */
-                                             (const char *)pStatus->szUser,
-                                             /* Domain */
-                                               pStatus->cbDomain
-                                             ? (const char *)pStatus->szUser[pStatus->cbUser]
-                                             : NULL,
+        /* pyDynamic marks the beginning of the struct's dynamically
+         * allocated data area. */
+        uint8_t *pvDynamic = (uint8_t *)pStatus + RT_OFFSETOF(VBoxGuestUserStatus, szUser);
+        AssertPtr(pvDynamic);
+
+        if (!pStatus->cbUser)) /* User name is required. */
+            return VERR_INVALID_PARAMETER;
+        const char *pszUser = (const char *)pvDynamic;
+        AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
+
+        pvDynamic += pStatus->cbUser; /* Advance to next field. */
+        const char *pszDomain = pStatus->cbDomain
+                              ? (const char *)pvDynamic : NULL;
+        /* Note: pszDomain can be NULL. */
+
+        pvDynamic += pStatus->cbDomain; /* Advance to next field. */
+        const uint8_t *puDetails = (uint8_t *)pStatus->cbDetails
+                                 ? pvDynamic : NULL;
+        /* Note: puDetails can be NULL. */
+
+        pThis->pDrv->pfnUpdateGuestUserState(pThis->pDrv, pszUser, pszDomain,
                                              /* State */
                                              (uint32_t)pStatus->state,
                                              /* State details */
-                                               pStatus->cbDetails
-                                             ? (uint8_t *)pStatus->szUser[pStatus->cbUser + pStatus->cbDomain]
-                                             : NULL,
+                                             puDetails,
                                              pStatus->cbDetails);
     }