Changeset 82007 in vbox

Timestamp:

Nov 19, 2019 7:46:36 PM (6 years ago)

Author:

vboxsync

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

134809

Message:

Main/GraphicsAdapter: fix lock order issues

File:

• trunk/src/VBox/Main/src-server/GraphicsAdapterImpl.cpp (modified) (3 diffs)

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

@@ -248 +248 @@
 HRESULT GraphicsAdapter::setAccelerate3DEnabled(BOOL aAccelerate3DEnabled)
 {
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     /* the machine needs to be mutable */
     AutoMutableStateDependency adep(mParent);
     if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     /** @todo check validity! */
@@ -280 +280 @@
 HRESULT GraphicsAdapter::setAccelerate2DVideoEnabled(BOOL aAccelerate2DVideoEnabled)
 {
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     /* the machine needs to be mutable */
     AutoMutableStateDependency adep(mParent);
     if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     /** @todo check validity! */
@@ -312 +312 @@
                         aMonitorCount, 1, SchemaDefs::MaxGuestMonitors);
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     /* the machine needs to be mutable */
     AutoMutableStateDependency adep(mParent);
     if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     mParent->i_setModified(Machine::IsModified_GraphicsAdapter);