Changeset 55353 in vbox for trunk/include/VBox

Timestamp:

Apr 21, 2015 1:10:25 PM (10 years ago)

Author:

vboxsync

Message:

include/VBox/HostServices/Service.h: adjusted Message implementation to not allow callers to reallocate HGCM pointers.

File:

• trunk/include/VBox/HostServices/Service.h (modified) (5 diffs)

trunk/include/VBox/HostServices/Service.h

@@ -41 +41 @@
 class Message
 {
+    /* Contains a copy of HGCM parameters. */
 public:
     Message(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[])
@@ -47 +48 @@
         , m_paParms(0)
     {
-        setData(uMsg, cParms, aParms);
+        initData(uMsg, cParms, aParms);
     }
     ~Message()
@@ -72 +73 @@
         }
 
-        int rc = copyParms(cParms, m_paParms, &aParms[0], false /* fCreatePtrs */);
+        int rc = copyParmsInternal(cParms, m_paParms, &aParms[0], false /* fCreatePtrs */);
 
 //        if (RT_FAILURE(rc))
 //            cleanup(aParms);
-        return rc;
-    }
-    int setData(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[])
-    {
-        AssertReturn(cParms < 256, VERR_INVALID_PARAMETER);
-        AssertPtrNullReturn(aParms, VERR_INVALID_PARAMETER);
-
-        /* Cleanup old messages. */
-        cleanup();
-
-        m_uMsg = uMsg;
-        m_cParms = cParms;
-
-        if (cParms > 0)
-        {
-            m_paParms = (VBOXHGCMSVCPARM*)RTMemAllocZ(sizeof(VBOXHGCMSVCPARM) * m_cParms);
-            if (!m_paParms)
-                return VERR_NO_MEMORY;
-        }
-
-        int rc = copyParms(cParms, &aParms[0], m_paParms, true /* fCreatePtrs */);
-
-        if (RT_FAILURE(rc))
-            cleanup();
-
         return rc;
     }
@@ -137 +113 @@
     }
 
-    int copyParms(uint32_t cParms, PVBOXHGCMSVCPARM paParmsSrc, PVBOXHGCMSVCPARM paParmsDst, bool fCreatePtrs) const
+    int copyParms(uint32_t cParms, PVBOXHGCMSVCPARM paParmsSrc, PVBOXHGCMSVCPARM paParmsDst) const
+    {
+        return copyParmsInternal(cParms, paParmsSrc, paParmsDst, false /* fCreatePtrs */);
+    }
+
+private:
+    uint32_t m_uMsg;
+    uint32_t m_cParms;
+    PVBOXHGCMSVCPARM m_paParms;
+
+    int initData(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[])
+    {
+        AssertReturn(cParms < 256, VERR_INVALID_PARAMETER);
+        AssertPtrNullReturn(aParms, VERR_INVALID_PARAMETER);
+
+        /* Cleanup old messages. */
+        cleanup();
+
+        m_uMsg = uMsg;
+        m_cParms = cParms;
+
+        if (cParms > 0)
+        {
+            m_paParms = (VBOXHGCMSVCPARM*)RTMemAllocZ(sizeof(VBOXHGCMSVCPARM) * m_cParms);
+            if (!m_paParms)
+                return VERR_NO_MEMORY;
+        }
+
+        int rc = copyParmsInternal(cParms, &aParms[0], m_paParms, true /* fCreatePtrs */);
+
+        if (RT_FAILURE(rc))
+            cleanup();
+
+        return rc;
+    }
+
+    int copyParmsInternal(uint32_t cParms, PVBOXHGCMSVCPARM paParmsSrc, PVBOXHGCMSVCPARM paParmsDst, bool fCreatePtrs) const
     {
         int rc = VINF_SUCCESS;
@@ -219 +231 @@
         m_uMsg = 0;
     }
-
-protected:
-    uint32_t m_uMsg;
-    uint32_t m_cParms;
-    PVBOXHGCMSVCPARM m_paParms;
 };