Changeset 42823 in vbox for trunk

Timestamp:

Aug 15, 2012 11:32:14 AM (12 years ago)

Author:

vboxsync

Message:

Main/Machine:

1. function STDMETHODIMP Machine::RemoveStorageController() - creating temporary list "llAttachments2", because STL::list "mMediaData->mAttachments" produce invalid iterator during deleting items from it inside the function detachDevice().

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5945 +5945 @@
     {
         /* find all attached devices to the appropriate storage controller and detach them all */
-        size_t howManyAttach = mMediaData->mAttachments.size();
-
-        for (size_t i = 0; i < howManyAttach; ++i)
-        {
-            MediumAttachment *pAttachTemp = mMediaData->mAttachments.front();
+        // make a temporary list because detachDevice invalidates iterators into
+        // mMediaData->mAttachments
+        MediaData::AttachmentList llAttachments2 = mMediaData->mAttachments;
+
+        for (MediaData::AttachmentList::iterator it = llAttachments2.begin();
+        it != llAttachments2.end();
+        ++it)
+        {
+            MediumAttachment *pAttachTemp = *it;
 
             AutoCaller localAutoCaller(pAttachTemp);
@@ -5958 +5962 @@
             if (pAttachTemp->getControllerName() == aName)
             {
-                LONG port = pAttachTemp->getPort();
-                LONG device = pAttachTemp->getDevice();
-
-                //rc = DetachDevice(aName, port, device);
                 rc = detachDevice(pAttachTemp, alock, NULL);
                 if (FAILED(rc)) return rc;