Changeset 98358 in vbox for trunk/src/VBox/HostServices/HostChannel

Timestamp:

Jan 31, 2023 10:56:27 AM (2 years ago)

Author:

vboxsync

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

155595

Message:

HostServices/HostChannel: Address two todos

File:

• trunk/src/VBox/HostServices/HostChannel/VBoxHostChannelSvc.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/HostChannel/VBoxHostChannelSvc.cpp

@@ -245 +245 @@
 
             if (cParms != 3)
-            {
-                rc = VERR_INVALID_PARAMETER;
-            }
+                rc = VERR_INVALID_PARAMETER;
             else if (   paParms[0].type != VBOX_HGCM_SVC_PARM_PTR     /* name */
                      || paParms[1].type != VBOX_HGCM_SVC_PARM_32BIT   /* flags */
                      || paParms[2].type != VBOX_HGCM_SVC_PARM_32BIT   /* handle */
                     )
-            {
-                rc = VERR_INVALID_PARAMETER;
-            }
+                rc = VERR_INVALID_PARAMETER;
             else
             {
                 uint32_t u32Flags;
-                void *pvName;
+                const char *pszName;
                 uint32_t cbName;
 
-                rc = VBoxHGCMParmPtrGet(&paParms[0], &pvName, &cbName);
-
+                rc = VBoxHGCMParmPtrGet(&paParms[0], (void **)&pszName, &cbName);
+                if (   RT_SUCCESS(rc)
+                    && pszName[cbName - 1] != '\0')
+                    rc = VERR_INVALID_PARAMETER;
+                if (RT_SUCCESS(rc))
+                    rc = VBoxHGCMParmUInt32Get(&paParms[1], &u32Flags);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = VBoxHGCMParmUInt32Get(&paParms[1], &u32Flags);
-
+                    uint32_t u32Handle = 0;
+                    rc = vboxHostChannelAttach(pClient, &u32Handle, pszName, u32Flags);
                     if (RT_SUCCESS(rc))
-                    {
-                        uint32_t u32Handle = 0;
-
-                        /** @todo make sure that pvName is a nul terminated */
-                        rc = vboxHostChannelAttach(pClient, &u32Handle, (const char *)pvName, u32Flags);
-
-                        if (RT_SUCCESS(rc))
-                        {
-                            VBoxHGCMParmUInt32Set(&paParms[2], u32Handle);
-                        }
-                    }
+                        VBoxHGCMParmUInt32Set(&paParms[2], u32Handle);
                 }
             }
@@ -516 +506 @@
             else
             {
-                void *pvName;
+                const char *pszName;
                 uint32_t cbName;
                 uint32_t u32Code;
@@ -524 +514 @@
                 uint32_t cbData;
 
-                rc = VBoxHGCMParmPtrGet(&paParms[0], &pvName, &cbName);
-
+                rc = VBoxHGCMParmPtrGet(&paParms[0], (void **)&pszName, &cbName);
+                if (   RT_SUCCESS(rc)
+                    && pszName[cbName - 1] != '\0')
+                    rc = VERR_INVALID_PARAMETER;
+
+                if (RT_SUCCESS(rc))
+                    rc = VBoxHGCMParmUInt32Get(&paParms[1], &u32Code);
+                if (RT_SUCCESS (rc))
+                    rc = VBoxHGCMParmPtrGet(&paParms[2], &pvParm, &cbParm);
+                if (RT_SUCCESS (rc))
+                    rc = VBoxHGCMParmPtrGet(&paParms[3], &pvData, &cbData);
                 if (RT_SUCCESS (rc))
                 {
-                    rc = VBoxHGCMParmUInt32Get (&paParms[1], &u32Code);
-
-                    if (RT_SUCCESS (rc))
-                    {
-                        rc = VBoxHGCMParmPtrGet (&paParms[2], &pvParm, &cbParm);
-
-                        if (RT_SUCCESS (rc))
-                        {
-                            rc = VBoxHGCMParmPtrGet (&paParms[3], &pvData, &cbData);
-
-                            if (RT_SUCCESS (rc))
-                            {
-                                uint32_t u32SizeDataReturned = 0;
-
-                                /** @todo make sure that pvName is a nul terminated */
-                                rc = vboxHostChannelQuery(pClient, (const char *)pvName, u32Code,
-                                                          pvParm, cbParm,
-                                                          pvData, cbData, &u32SizeDataReturned);
-                                if (RT_SUCCESS(rc))
-                                {
-                                    VBoxHGCMParmUInt32Set(&paParms[4], u32SizeDataReturned);
-                                }
-                            }
-                        }
-                    }
+                    uint32_t u32SizeDataReturned = 0;
+                    rc = vboxHostChannelQuery(pClient, pszName, u32Code,
+                                              pvParm, cbParm,
+                                              pvData, cbData, &u32SizeDataReturned);
+                    if (RT_SUCCESS(rc))
+                        VBoxHGCMParmUInt32Set(&paParms[4], u32SizeDataReturned);
                 }
             }