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

Timestamp:

Jan 30, 2019 11:18:06 AM (6 years ago)

Author:

vboxsync

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

128482

Message:

Main/Machine: fix CPUID override removal, it ran into iterator/collection mismatch due to the weird semantics of Backupable<T>::backup(), never coming to an end

File:

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

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

@@ -2245 +2245 @@
      * Do the removal.
      */
-    bool fModified = false;
+    bool fModified = mHWData.isBackedUp();
     for (settings::CpuIdLeafsList::iterator it = mHWData->mCpuIdLeafList.begin(); it != mHWData->mCpuIdLeafList.end(); )
     {
@@ -2258 +2258 @@
                 i_setModified(IsModified_MachineData);
                 mHWData.backup();
+                // Start from the beginning, since mHWData.backup() creates
+                // a new list, causing iterator mixup. This makes sure that
+                // the settings are not unnecessarily marked as modified,
+                // at the price of extra list walking.
+                it = mHWData->mCpuIdLeafList.begin();
             }
-            it = mHWData->mCpuIdLeafList.erase(it);
+            else
+                it = mHWData->mCpuIdLeafList.erase(it);
         }
         else