Changeset 24524 in vbox

Timestamp:

Nov 9, 2009 5:47:03 PM (15 years ago)

Author:

vboxsync

Message:

Main/Machine: fix error handling in MountMedium, dropping the error code and not undoing the mount on failure are two severe bugs

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2823 +2823 @@
                         tr("No drive attached to device slot %d on port %d of controller '%ls'"),
                         aDevice, aControllerPort, aControllerName);
+
+    /* Remember previously mounted medium. The medium before taking the
+     * backup is not necessarily the same thing. */
+    ComObjPtr<Medium> oldmedium;
+    oldmedium = pAttach->medium();
 
     Guid id(aId);
@@ -2900 +2905 @@
     }
 
-    alock.unlock();
-    onMediumChange(pAttach, aForce);
+    alock.leave();
+    rc = onMediumChange(pAttach, aForce);
+    alock.enter();
+
+    /* On error roll back this change only. */
+    if (FAILED(rc))
+    {
+        if (!medium.isNull())
+            medium->detachFrom(mData->mUuid);
+        pAttach = findAttachment(mMediaData->mAttachments,
+                                 aControllerName,
+                                 aControllerPort,
+                                 aDevice);
+        /* If the attachment is gone in the mean time, bail out. */
+        if (pAttach.isNull())
+            return rc;
+        AutoWriteLock attLock(pAttach);
+        pAttach->updateMedium(oldmedium, false /* aImplicit */);
+    }
 
     return rc;