Changeset 38397 in vbox

Timestamp:

Aug 10, 2011 12:17:28 PM (13 years ago)

Author:

vboxsync

Message:

Main/Medium: fix object locks and medium lock state in createDiffStorage()

File:

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

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

@@ -2537 +2537 @@
     ComObjPtr<Medium> diff = static_cast<Medium*>(aTarget);
 
+    // locking: we need the tree lock first because we access parent pointers
+    AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -2563 +2565 @@
         return rc;
     }
+
+    rc = pMediumLockList->Lock();
+    if (FAILED(rc))
+    {
+        delete pMediumLockList;
+
+        return setError(rc, tr("Could not lock medium when creating diff '%s'"),
+                        diff->getLocationFull().c_str());
+    }
+    treeLock.release();
+    alock.release();
 
     ComObjPtr <Progress> pProgress;