Changeset 97742 in vbox for trunk/src/VBox/HostServices/common

Timestamp:

Dec 5, 2022 8:16:42 PM (2 years ago)

Author:

vboxsync

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

154803

Message:

HostServices/common: Resolved a @todo (use VMMDEV_MAX_HGCM_PARMS); don't (debug) assert for messages with 0 parameters (those are valid); this otherwise would lead to an initialized message with message type 0, which doesn't make any sense.

File:

• trunk/src/VBox/HostServices/common/message.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/common/message.cpp

@@ -27 +27 @@
 
 #include <VBox/HostServices/Service.h>
+#include <VBox/VMMDev.h> /* For VMMDEV_MAX_HGCM_PARMS. */
 
 using namespace HGCM;
@@ -99 +100 @@
         return VERR_INVALID_PARAMETER;
     }
+
+    if (m_cParms == 0) /* Nothing to copy, take a shortcut. */
+        return VINF_SUCCESS;
+
     if (m_cParms > cParms)
     {
@@ -268 +273 @@
 int Message::initData(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[]) RT_NOEXCEPT
 {
-    /** @todo r=bird: There is a define for the max number of HGCM parameters,
-     *        it's way smaller than 256, something like 61 IIRC. */
-    AssertReturn(cParms < 256, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(aParms, VERR_INVALID_PARAMETER);
+    AssertReturn(cParms < VMMDEV_MAX_HGCM_PARMS, VERR_INVALID_PARAMETER);
+    AssertReturn(cParms == 0 || aParms != NULL, VERR_INVALID_POINTER);
 
     /* Cleanup any eventual old stuff. */