Changeset 13555 in vbox

Timestamp:

Oct 24, 2008 2:09:12 PM (16 years ago)

Author:

vboxsync

Message:

Main (Guest Properties): more checks for allocation failures

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5164 +5164 @@
 
         Key guestPropertiesNode = aNode.findKey ("GuestProperties");
-        Bstr notificationPatterns ("");
+        Bstr notificationPatterns ("");  /* We catch allocation failure below. */
         if (!guestPropertiesNode.isNull())
         {
@@ -5181 +5181 @@
                 /* property flags (optional, defaults to empty) */
                 Bstr flags = (*it).stringValue ("flags");
-                validateFlags (Utf8Str (flags).raw(), &fFlags);
+                Utf8Str utf8Flags (flags);
+                if (utf8Flags.isNull ())
+                    return E_OUTOFMEMORY;
+                validateFlags (utf8Flags.raw(), &fFlags);
                 HWData::GuestProperty property = { name, value, timestamp, fFlags };
                 mHWData->mGuestProperties.push_back(property);
+                /* This is just sanity, as the push_back() will probably have thrown
+                 * an exception if we are out of memory.  Note that if we run out
+                 * allocating the Bstrs above, this will be caught here as well. */
+                if (   mHWData->mGuestProperties.back().mName.isNull ()
+                    || mHWData->mGuestProperties.back().mValue.isNull ()
+                   )
+                    return E_OUTOFMEMORY;
             }
             notificationPatterns = guestPropertiesNode.stringValue ("notificationPatterns");
@@ -5189 +5199 @@
         mHWData->mPropertyServiceActive = false;
         mHWData->mGuestPropertyNotificationPatterns = notificationPatterns;
+        if (mHWData->mGuestPropertyNotificationPatterns.isNull ())
+            return E_OUTOFMEMORY;
     }
 #endif /* VBOX_WITH_GUEST_PROPS defined */
@@ -6554 +6566 @@
 #ifdef VBOX_WITH_GUEST_PROPS
     /* Guest properties */
+    try
     {
         using namespace guestProp;
@@ -6560 +6573 @@
 
         for (HWData::GuestPropertyList::const_iterator it = mHWData->mGuestProperties.begin();
-             it != mHWData->mGuestProperties.end();
-             ++ it)
+             it != mHWData->mGuestProperties.end(); ++it)
         {
             HWData::GuestProperty property = *it;
@@ -6572 +6584 @@
             propertyNode.setValue <ULONG64> ("timestamp", property.mTimestamp);
             writeFlags(property.mFlags, szFlags);
-            propertyNode.setValue <Bstr> ("flags", Bstr(szFlags));
-        }
+            Bstr flags (szFlags);
+            if (flags.isNull())
+                return E_OUTOFMEMORY;
+            propertyNode.setValue <Bstr> ("flags", flags);
+        }
+        Bstr emptyStr ("");
+        if (emptyStr.isNull())
+            return E_OUTOFMEMORY;
         guestPropertiesNode.setValueOr <Bstr> ("notificationPatterns",
                                                mHWData->mGuestPropertyNotificationPatterns,
-                                               Bstr (""));
+                                               emptyStr);
+    }
+    catch (ENoMemory e)
+    {
+        return E_OUTOFMEMORY;
     }
 #endif /* VBOX_WITH_GUEST_PROPS defined */