Changeset 24342 in vbox

Timestamp:

Nov 4, 2009 3:42:41 PM (16 years ago)

Author:

vboxsync

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

54361

Message:

Main/Machine: fix deadlock caused by lock order violation in SessionMachine::OnSessionEnd

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8605 +8605 @@
     ComAssertRet (!control.isNull(), E_INVALIDARG);
 
-    AutoWriteLock alock(this);
+    /* Creating a Progress object requires the VirtualBox children lock, and
+     * thus locking it here is required by the lock order rules. */
+    AutoMultiWriteLock2 alock(mParent->childrenLock(), this->lockHandle());
 
     if (control.equalsTo (mData->mSession.mDirectControl))