Changeset 29192 in vbox for trunk/src

Timestamp:

May 7, 2010 9:54:07 AM (15 years ago)

Author:

vboxsync

Message:

Main/Machine: actually fulfill the locking requirements of the internal method used by getMediumAttachmentsOfController()

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7332 +7332 @@
          ++it)
     {
-        if ((*it)->getControllerName() == aName)
-            atts.push_back(*it);
+        const ComObjPtr<MediumAttachment> &pAtt = *it;
+
+        // should never happen, but deal with NULL pointers in the list.
+        AssertStmt(!pAtt.isNull(), continue);
+
+        // getControllerName() needs caller+read lock
+        AutoCaller autoAttCaller(pAtt);
+        if (FAILED(autoAttCaller.rc()))
+        {
+            atts.clear();
+            return autoAttCaller.rc();
+        }
+        AutoReadLock attLock(pAtt COMMA_LOCKVAL_SRC_POS);
+
+        if (pAtt->getControllerName() == aName)
+            atts.push_back(pAtt);
     }