Changeset 75873 in vbox for trunk/src/VBox/HostServices/GuestControl/service.cpp

Timestamp:

Dec 2, 2018 4:32:27 PM (6 years ago)

Author:

vboxsync

Message:

GuestControl: Dropped the HostCommand reference counting and sharing ability since we only need it for the session closing request/message/command/wussname. This means we can use iprt/list.h and run no risk of bad_alloc during EnqueueCommand(). bugref:9313 [build fix]

File:

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

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

@@ -81 +81 @@
 #include <map>
 #include <new>      /* for std::nothrow*/
-#include <string>
-#include <list>
 
 
@@ -435 +433 @@
     /** @} */
 } HostCommand;
-typedef std::list< HostCommand *> HostCmdList;
 
 /**
@@ -1015 +1012 @@
      * Cancel all pending host commands, replying with GUEST_DISCONNECTED if final recipient.
      */
-    HostCommand *pCur, *pNext;
-    RTListForEachSafeCpp(&pClient->m_HostCmdList, pCur, pNext, HostCommand, m_ListEntry)
-    {
-        RTListNodeRemove(&pCur->m_ListEntry);
+    HostCommand *pCurCmd, *pNextCmd;
+    RTListForEachSafeCpp(&pClient->m_HostCmdList, pCurCmd, pNextCmd, HostCommand, m_ListEntry)
+    {
+        RTListNodeRemove(&pCurCmd->m_ListEntry);
 
         VBOXHGCMSVCPARM Parm;
-        HGCMSvcSetU32(&Parm, pCur->m_idContext);
+        HGCMSvcSetU32(&Parm, pCurCmd->m_idContext);
         int rc2 = pThis->hostCallback(GUEST_DISCONNECTED, 1, &Parm);
         LogFlowFunc(("Cancelled host command %u (%s) with idContext=%#x -> %Rrc\n",
-                     pCur->mMsgType, GstCtrlHostFnName((eHostFn)pCur->mMsgType), pCur->m_idContext, rc2));
+                     pCurCmd->mMsgType, GstCtrlHostFnName((eHostFn)pCurCmd->mMsgType), pCurCmd->m_idContext, rc2));
         RT_NOREF(rc2);
 
-        pCur->Delete();
+        pCurCmd->Delete();
     }