Changeset 11096 in vbox for trunk/src/VBox

Timestamp:

Aug 4, 2008 12:15:41 PM (17 years ago)

Author:

vboxsync

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

34017

Message:

Main: deal with changing existing guest properties correctly (was using an invalid iterator)

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2758 +2758 @@
 }
 
-STDMETHODIMP Machine::SetGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue, INPTR BSTR aFlags)
+STDMETHODIMP Machine::SetGuestProperty (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags)
 {
 #if !defined (VBOX_WITH_GUEST_PROPS)
     return E_NOTIMPL;
 #else
-    if (!VALID_PTR (aKey))
+    if (!VALID_PTR (aName))
         return E_INVALIDARG;
     if ((aValue != NULL) && !VALID_PTR (aValue))
@@ -2790 +2790 @@
     {
         bool found = false;
-        HWData::GuestPropertyList::iterator targetIt = mHWData->mGuestProperties.end();
+        HWData::GuestProperty property;
         for (HWData::GuestPropertyList::iterator it = mHWData->mGuestProperties.begin();
              (it != mHWData->mGuestProperties.end()) && !found; ++it)
-            if (it->mName == aKey)
+            if (it->mName == aName)
             {
-                targetIt = it;
+                property = *it;
+                mHWData.backup();
+                /* The backup() operation invalidates our iterator, so get a
+                 * new one. */
+                for (it = mHWData->mGuestProperties.begin();
+                     it->mName != aName; ++it); 
+                mHWData->mGuestProperties.erase(it);
                 found = true;
             }
-        if (targetIt != mHWData->mGuestProperties.end())
+        if (found)
+        {
+            if (NULL != aValue)
+            {
+                property.mValue = aValue;
+                property.mTimestamp = RTTimeMilliTS();
+                if (aFlags != NULL)
+                    property.mFlags = aFlags;
+                mHWData->mGuestProperties.push_back(property);
+            }
+        }
+        else if (aValue != NULL)
         {
             mHWData.backup();
-            if (NULL == aValue)
-                mHWData->mGuestProperties.erase(targetIt);
-            else
-            {
-                targetIt->mValue = aValue;
-                targetIt->mTimestamp = RTTimeMilliTS();
-                if (aFlags != NULL)
-                    targetIt->mFlags = aFlags;
-            }
-        }
-        else if (aValue != NULL)
-        {
-            mHWData.backup();
-            HWData::GuestProperty property;
-            property.mName = aKey;
+            property.mName = aName;
             property.mValue = aValue;
             property.mTimestamp = RTTimeMilliTS();
@@ -2833 +2836 @@
         BSTR dummy = NULL;
         ULONG64 dummy64;
-        rc = directControl->AccessGuestProperty (aKey, aValue, aFlags,
+        rc = directControl->AccessGuestProperty (aName, aValue, aFlags,
                                                  true /* isSetter */,
                                                  &dummy, &dummy64, &dummy);