Changeset 66892 in vbox

Timestamp:

May 15, 2017 2:30:58 PM (8 years ago)

Author:

vboxsync

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

115409

Message:

Main/Guest Control: Iterator fixes for signalWaitEvent() and unregisterWaitEvent() with map::erase().

File:

• trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -854 +854 @@
 
                     /* Remove the event from the passed-in event group. */
-                    itGroup->second.erase(itEvents++);
+                    itEvents = itGroup->second.erase(itEvents);
                 }
                 else
-                    ++itEvents;
+                    itEvents++;
 #ifdef DEBUG
                 cEvents++;
@@ -947 +947 @@
                     if (itCurEvent->second == pEvent)
                     {
-                        mWaitEventGroups[(*itType)].erase(itCurEvent++);
+                        itCurEvent = mWaitEventGroups[(*itType)].erase(itCurEvent);
                         break;
                     }
                     else
-                        ++itCurEvent;
+                        itCurEvent++;
                 }
             }