Changeset 98102 in vbox

Timestamp:

Jan 17, 2023 11:11:43 AM (23 months ago)

Author:

vboxsync

Message:

Main/Machine: Assert that mData->mSession.mLockedMedia is locked before unlocking + modifying + relocking, as this seems to be an assumption in these three cases.

Location:

trunk/src/VBox/Main

Files:

• include/MediumLock.h (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/MediumLock.h

@@ -342 +342 @@
     HRESULT Unlock();
 
+    /** Introspection. */
+    bool IsLocked(void) const { return mIsLocked; }
+
 private:
     typedef std::map<ComObjPtr<MediumAttachment>, MediumLockList *> Base;

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

@@ -4013 +4013 @@
                         else
                         {
+                            Assert(mData->mSession.mLockedMedia.IsLocked());
                             mData->mSession.mLockedMedia.Unlock();
                             alock.release();
@@ -4114 +4115 @@
                                 else
                                 {
+                                    Assert(mData->mSession.mLockedMedia.IsLocked());
                                     mData->mSession.mLockedMedia.Unlock();
                                     alock.release();
@@ -4389 +4391 @@
             else
             {
+                Assert(mData->mSession.mLockedMedia.IsLocked());
                 mData->mSession.mLockedMedia.Unlock();
                 alock.release();
@@ -12069 +12072 @@
                     if (!fMediaNeedsLocking)
                     {
+                        Assert(mData->mSession.mLockedMedia.IsLocked());
                         rc = mData->mSession.mLockedMedia.Unlock();
                         AssertComRC(rc);