Changeset 42021 in vbox for trunk

Timestamp:

Jul 4, 2012 2:18:14 PM (13 years ago)

Author:

vboxsync

Message:

Main/Machine: added a caller and a read lock before calling of MediumAttachment instance in the function RemoveStorageController.

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -5827 +5827 @@
     if (FAILED(rc)) return rc;
 
-    {/* find all attached devices to the appropriate storage controller and detach them all*/
-        MediaData::AttachmentList::const_iterator beginList = mMediaData->mAttachments.begin();
+    {
+        /* find all attached devices to the appropriate storage controller and detach them all*/
         MediaData::AttachmentList::const_iterator endList = mMediaData->mAttachments.end();
+        MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
+        MediumAttachment *pAttachTemp=NULL;
         LONG port = 0;
         LONG device = 0;
 
-        for (MediaData::AttachmentList::const_iterator it = beginList;
-             it != endList;
-             it++)
-        {
-            if ((*it)->getControllerName() == aName)
+        for (;it != endList; it++)
+        {
+            pAttachTemp = *it;
+            AutoCaller localAutoCaller(pAttachTemp);
+            if (FAILED(localAutoCaller.rc())) return localAutoCaller.rc();
+
+            AutoReadLock local_alock(pAttachTemp COMMA_LOCKVAL_SRC_POS);
+
+            if (pAttachTemp->getControllerName() == aName)
             {
-                port = (*it)->getPort();
-
-                device = (*it)->getDevice();
+
+                port = pAttachTemp->getPort();
+
+                device = pAttachTemp->getDevice();
 
                 rc = DetachDevice(aName, port, device);