Changeset 60261 in vbox for trunk/include

Timestamp:

Mar 30, 2016 2:10:13 PM (9 years ago)

Author:

vboxsync

Message:

HostServices/Service.h: Only copy parameters if a valid parameter count is given.

File:

• trunk/include/VBox/HostServices/Service.h (modified) (1 diff)

trunk/include/VBox/HostServices/Service.h

@@ -133 +133 @@
         cleanup();
 
-        m_uMsg = uMsg;
+        m_uMsg   = uMsg;
         m_cParms = cParms;
 
-        if (cParms > 0)
+        int rc;
+        if (cParms)
         {
             m_paParms = (VBOXHGCMSVCPARM*)RTMemAllocZ(sizeof(VBOXHGCMSVCPARM) * m_cParms);
-            if (!m_paParms)
-                return VERR_NO_MEMORY;
+            if (m_paParms)
+            {
+                rc = copyParmsInternal(m_paParms, m_cParms, &aParms[0], cParms, true /* fDeepCopy */);
+                if (RT_FAILURE(rc))
+                    cleanup();
+            }
+            else
+                rc = VERR_NO_MEMORY;
         }
-
-        int rc = copyParmsInternal(m_paParms, m_cParms, &aParms[0], cParms, true /* fDeepCopy */);
-        if (RT_FAILURE(rc))
-            cleanup();
 
         return rc;