Changeset 62105 in vbox for trunk

Timestamp:

Jul 7, 2016 2:20:33 PM (9 years ago)

Author:

vboxsync

Message:

Main/Machine: fix extradata map copying to work where STL isn't checking for self assignment of maps

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -8688 +8688 @@
     if (FAILED(rc)) return rc;
 
-    /* Copy the extra data items (Not in any case config is already the same as
-     * mData->pMachineConfigFile, like when the xml files are read from disk. So
-     * make sure the extra data map is copied). */
-    mData->pMachineConfigFile->mapExtraDataItems = config.mapExtraDataItems;
+    /* Copy the extra data items (config may or may not be the same as
+     * mData->pMachineConfigFile) if necessary. When loading the XML files
+     * from disk they are the same, but not for OVF import. */
+    if (mData->pMachineConfigFile != &config)
+        mData->pMachineConfigFile->mapExtraDataItems = config.mapExtraDataItems;
 
     /* currentStateModified (optional, default is true) */
@@ -9953 +9954 @@
 
         // now go and copy all the settings data from COM to the settings structures
-        // (this calles i_saveSettings() on all the COM objects in the machine)
+        // (this calls i_saveSettings() on all the COM objects in the machine)
         i_copyMachineDataToSettings(*pNewConfig);
 
@@ -10055 +10056 @@
 void Machine::i_copyMachineDataToSettings(settings::MachineConfigFile &config)
 {
-    // deep copy extradata
-    config.mapExtraDataItems = mData->pMachineConfigFile->mapExtraDataItems;
+    // deep copy extradata, being extra careful with self assignment (the STL
+    // map assignment on Mac OS X clang based Xcode isn't checking)
+    if (&config != mData->pMachineConfigFile)
+        config.mapExtraDataItems = mData->pMachineConfigFile->mapExtraDataItems;
 
     config.uuid = mData->mUuid;