Changeset 23328 in vbox

Timestamp:

Sep 25, 2009 11:48:22 AM (16 years ago)

Author:

vboxsync

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

52835

Message:

Main: fix assert + crash attaching disk

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2143 +2143 @@
                     MediumAttachment *pAttach = *it;
                     ComObjPtr<Medium> pMedium = pAttach->medium();
-                    Assert(!pMedium.isNull());
+                    Assert(!pMedium.isNull() || pAttach->type() != DeviceType_HardDisk);
+                    if (pMedium.isNull())
+                        continue;
 
                     if (pMedium->base(&level).equalsTo(medium))
@@ -2208 +2210 @@
                      ++it)
                 {
+                    MediumAttachment *pAttach = *it;
+                    ComObjPtr<Medium> pMedium = pAttach->medium();
+                    Assert(!pMedium.isNull() || pAttach->type() != DeviceType_HardDisk);
+                    if (pMedium.isNull())
+                        continue;
+
                     uint32_t level = 0;
-                    if ((*it)->medium()->base(&level).equalsTo(medium))
+                    if (pMedium->base(&level).equalsTo(medium))
                     {
                         /* matched device, channel and bus (i.e. attached to the