Changeset 20099 in vbox for trunk/src/VBox/Main/HardDiskImpl.cpp

Timestamp:

May 27, 2009 4:04:48 PM (16 years ago)

Author:

vboxsync

Message:

Deal with empty lists in HardDisk::ImageChain dtor

File:

• trunk/src/VBox/Main/HardDiskImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -490 +490 @@
     ~ImageChain()
     {
-        List::const_iterator last = end();
-        last--;
-        for (List::const_iterator it = begin(); it != end(); ++ it)
-        {
-            AutoWriteLock alock (*it);
-            if (it == last)
+        /* empty? */
+        if (begin() != end())
+        {
+            List::const_iterator last = end();
+            last--;
+            for (List::const_iterator it = begin(); it != end(); ++ it)
             {
-                Assert (   (*it)->m.state == MediaState_LockedRead
-                        || (*it)->m.state == MediaState_LockedWrite);
-                if ((*it)->m.state == MediaState_LockedRead)
-                    (*it)->UnlockRead (NULL);
-                else if ((*it)->m.state == MediaState_LockedWrite)
-                    (*it)->UnlockWrite (NULL);
+                AutoWriteLock alock (*it);
+                if (it == last)
+                {
+                    Assert (   (*it)->m.state == MediaState_LockedRead
+                            || (*it)->m.state == MediaState_LockedWrite);
+                    if ((*it)->m.state == MediaState_LockedRead)
+                        (*it)->UnlockRead (NULL);
+                    else if ((*it)->m.state == MediaState_LockedWrite)
+                        (*it)->UnlockWrite (NULL);
+                }
+                else
+                {
+                    Assert ((*it)->m.state == MediaState_LockedRead);
+                    if ((*it)->m.state == MediaState_LockedRead)
+                        (*it)->UnlockRead (NULL);
+                }
+
+                (*it)->releaseCaller();
             }
-            else
-            {
-                Assert ((*it)->m.state == MediaState_LockedRead);
-                if ((*it)->m.state == MediaState_LockedRead)
-                    (*it)->UnlockRead (NULL);
-            }
-
-            (*it)->releaseCaller();
         }
     }