Changeset 28132 in vbox for trunk/src/VBox/HostServices

Timestamp:

Apr 9, 2010 10:02:00 AM (15 years ago)

Author:

vboxsync

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

59855

Message:

Guest Control: Update (fixed leak in host service, --wait option for VBoxManage).

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -453 +453 @@
                  rc = execBufferAssign(&curCmd.parmBuf, cParms, paParms);
                  if (RT_SUCCESS(rc))
+                 {
+                     execBufferFree(&curCmd.parmBuf);
                      mHostCmds.pop_front();
+                 }
              }
         }
@@ -487 +490 @@
     int rc = VINF_SUCCESS;
 
-    HostCmd newCmd;
-    execBufferAllocate(&newCmd.parmBuf, cParms, paParms);
-    mHostCmds.push_back(newCmd);
-
-    /* Limit list size by deleting oldest element. */
-    if (mHostCmds.size() > 256) /** @todo Use a define! */
-        mHostCmds.pop_front();
-
     /* Some lazy guests to wake up? */
     if (!mGuestWaiters.empty())
@@ -501 +496 @@
         rc = hostNotifyGuest(&curCall, eFunction, cParms, paParms);
         mGuestWaiters.pop_front();
+    }
+    else /* No guests waiting, buffer it */
+    {
+        HostCmd newCmd;
+        rc = execBufferAllocate(&newCmd.parmBuf, cParms, paParms);
+        if (RT_SUCCESS(rc))
+        {
+            mHostCmds.push_back(newCmd);
+        
+            /* Limit list size by deleting oldest element. */
+            if (mHostCmds.size() > 256) /** @todo Use a define! */
+                mHostCmds.pop_front();
+        }
     }
     return rc;