Changeset 21394 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Jul 8, 2009 1:06:27 PM (15 years ago)

Author:

vboxsync

Message:

Backing out r49763 to fix Windows burns.

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1801 +1801 @@
      * Guest property service
      */
-    try
     {
         /* Load the service */
@@ -1845 +1844 @@
                 timestamps.push_back(timestampsOut[i]);
                 utf8Flags.push_back(Bstr(flagsOut[i]));
+#if 0 /** @todo r=bird: Who is gonna catch this? Why does it trigger now? */
+                if (   utf8Names.back().isNull()
+                    || utf8Values.back().isNull()
+                    || utf8Flags.back().isNull()
+                   )
+                    throw std::bad_alloc();
+#endif
             }
             for (unsigned i = 0; i < cProps && RT_SUCCESS(rc); ++i)
@@ -1883 +1889 @@
             Log(("Set VBoxGuestPropSvc property store\n"));
         }
-    }
-    catch(std::bad_alloc &e)
-    {
-        return VERR_NO_MEMORY;
     }
 #endif /* VBOX_WITH_GUEST_PROPS defined */