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

Timestamp:

Apr 12, 2010 9:39:49 AM (15 years ago)

Author:

vboxsync

Message:

Main: OVF crash fix, settings::ConfigFileBase must not be copyable

File:

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

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -1934 +1934 @@
     Assert(vsdescThis->m->pConfig);
 
-    // make a deep copy of the machine settings here because we will tinker
-    // with it by replacing disk UUIDs
-    settings::MachineConfigFile config = *vsdescThis->m->pConfig;
+    settings::MachineConfigFile &config = *vsdescThis->m->pConfig;
 
     Utf8Str strDefaultHardDiskFolder;
@@ -1942 +1940 @@
     if (FAILED(rc)) throw rc;
 
-    // step 1): scan the machine config for UUIDs
+    // step 1): scan the machine config for attachments
     for (settings::StorageControllersList::iterator sit = config.storageMachine.llStorageControllers.begin();
          sit != config.storageMachine.llStorageControllers.end();
@@ -1977 +1975 @@
                     searchUniqueDiskImageFilePath(strTargetPath);
 
-                    // step 2): import disks and map the old and new UUIDs
+                    // step 2): for each attachment, import the disk...
                     ComPtr<IMedium> pTargetHD;
                     importOneDiskImage(di,
@@ -1984 +1982 @@
                                        stack);
 
+                    // ... and replace the old UUID in the machine config with the one of
+                    // the imported disk that was just created
                     Bstr hdId;
                     rc = pTargetHD->COMGETTER(Id)(hdId.asOutParam());
                     if (FAILED(rc)) throw rc;
 
-                    // replace the old UUID in the machine config with the new one
                     d.uuid = hdId;
+
                     fFound = true;
                     break;