Changeset 49687 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Nov 27, 2013 6:00:49 PM (11 years ago)

Author:

vboxsync

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

90957

Message:

Main/Snapshot: block deleting of current snapshot if it has child snapshots, as this would lead to VM config corruption, plus safety belts in the GUI and settings reader

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -3698 +3698 @@
  * Snapshot structure.
  *
+ * @param curSnapshotUuid
  * @param depth
  * @param elmSnapshot
  * @param snap
- */
-void MachineConfigFile::readSnapshot(uint32_t depth,
+ * @returns true if curSnapshotUuid is in this snapshot subtree, otherwise false
+ */
+bool MachineConfigFile::readSnapshot(const Guid &curSnapshotUuid,
+                                     uint32_t depth,
                                      const xml::ElementNode &elmSnapshot,
                                      Snapshot &snap)
@@ -3714 +3717 @@
         throw ConfigFileError(this, &elmSnapshot, N_("Required Snapshot/@uuid attribute is missing"));
     parseUUID(snap.uuid, strTemp);
+    bool foundCurrentSnapshot = (snap.uuid == curSnapshotUuid);
 
     if (!elmSnapshot.getAttributeValue("name", snap.strName))
@@ -3758 +3762 @@
                     // small, especially with XPCOM.
                     Snapshot *child = new Snapshot();
-                    readSnapshot(depth + 1, *pelmChildSnapshot, *child);
+                    bool found = readSnapshot(curSnapshotUuid, depth + 1, *pelmChildSnapshot, *child);
+                    foundCurrentSnapshot = foundCurrentSnapshot || found;
                     snap.llChildSnapshots.push_back(*child);
                     delete child;
@@ -3774 +3779 @@
     readAutostart(elmSnapshot.findChildElement("Autostart"), &snap.autostart);
     // note: Groups exist only for Machine, not for Snapshot
+
+    return foundCurrentSnapshot;
 }
 
@@ -3894 +3901 @@
             else if (pelmMachineChild->nameEquals("Snapshot"))
             {
+                if (uuidCurrentSnapshot.isZero())
+                    throw ConfigFileError(this, &elmMachine, N_("Snapshots present but required Machine/@currentSnapshot attribute is missing"));
+                bool foundCurrentSnapshot = false;
                 Snapshot snap;
                 // this will recurse into child snapshots, if necessary
-                readSnapshot(1, *pelmMachineChild, snap);
+                foundCurrentSnapshot = readSnapshot(uuidCurrentSnapshot, 1, *pelmMachineChild, snap);
+                if (!foundCurrentSnapshot)
+                    throw ConfigFileError(this, &elmMachine, N_("Snapshots present but none matches the UUID in the Machine/@currentSnapshot attribute"));
                 llFirstSnapshot.push_back(snap);
             }