Changeset 23245 in vbox for trunk

Timestamp:

Sep 23, 2009 8:12:07 AM (15 years ago)

Author:

vboxsync

Message:

Main/MachineImpl: add a few missing null medium checks

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1977 +1977 @@
     {
         Medium *pMedium = pAttachTemp->medium();
-        AutoReadLock mediumLock(pMedium);
-        return setError(VBOX_E_OBJECT_IN_USE,
-                        tr("Medium '%ls' is already attached to device slot %d on port %d of controller '%ls' of this virtual machine"),
-                        pMedium->locationFull().raw(), aDevice, aControllerPort, aControllerName);
+        if (pMedium)
+        {
+            AutoReadLock mediumLock(pMedium);
+            return setError(VBOX_E_OBJECT_IN_USE,
+                            tr("Medium '%ls' is already attached to device slot %d on port %d of controller '%ls' of this virtual machine"),
+                            pMedium->locationFull().raw(), aDevice, aControllerPort, aControllerName);
+        }
+        else
+            return setError(VBOX_E_OBJECT_IN_USE,
+                            tr("Device is already attached to slot %d on port %d of controller '%ls' of this virtual machine"),
+                            aDevice, aControllerPort, aControllerName);
     }
 
@@ -2071 +2078 @@
     AutoWriteLock mediumLock(medium);
 
-    if ((pAttachTemp = findAttachment(mMediaData->mAttachments,
-                                      medium)))
+    if (   (pAttachTemp = findAttachment(mMediaData->mAttachments, medium))
+        && !medium.isNull())
     {
         return setError(VBOX_E_OBJECT_IN_USE,