Changeset 5559 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 30, 2007 4:04:51 PM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed: VBoxSVC would crash on attempt to create a VM with the duplicate name.

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -390 +390 @@
     mData->mConfigFileFull = configFileFull;
 
+    /* start with accessible */
     mData->mAccessible = TRUE;
 
@@ -430 +431 @@
                         mData->mConfigFileFull.raw(), vrc);
         }
+
+        /* reset mAccessible to make sure uninit() called by the AutoInitSpan
+         * destructor will not call uninitDataAndChildObjects() (we haven't
+         * initialized anything yet) */
+        if (FAILED (rc))
+            mData->mAccessible = FALSE;
     }
 
@@ -3661 +3668 @@
      * disk attachments will already be uninitialized and deleted, so this
      * code will not affect them. */
-    if (mType == IsMachine || mType == IsSnapshotMachine)
+    if (!!mHDData && (mType == IsMachine || mType == IsSnapshotMachine))
     {
         for (HDData::HDAttachmentList::const_iterator it =
@@ -3680 +3687 @@
 
     /* free data structures (the essential mData structure is not freed here
-     * since it still may be in use) */
+     * since it may be still in use) */
     mHDData.free();
     mHWData.free();