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

Timestamp:

Jul 9, 2009 11:11:11 AM (16 years ago)

Author:

vboxsync

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

49816

Message:

Main: remove ENoMemory exception class, replace with std::bad_alloc() to avoid string allocations after memory allocation failed already

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -6975 +6975 @@
                                                emptyStr);
     }
-    catch (xml::ENoMemory e)
+    catch(std::bad_alloc &e)
     {
         return E_OUTOFMEMORY;

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

@@ -415 +415 @@
             value = xmlEncodeSpecialChars (mNode->doc, value);
             if (value == NULL)
-                throw xml::ENoMemory();
+                throw std::bad_alloc();
         }
 
@@ -449 +449 @@
                                   (const xmlChar *) aValue);
     if (attr == NULL)
-        throw xml::ENoMemory();
+        throw std::bad_alloc();
 }
 
@@ -502 +502 @@
     xmlNodePtr node = xmlNewChild (mNode, NULL, (const xmlChar *) aName, NULL);
     if (node == NULL)
-        throw xml::ENoMemory();
+        throw std::bad_alloc();
 
     return Key (new XmlKeyBackend (node));
@@ -584 +584 @@
     m->ctxt = xmlNewParserCtxt();
     if (m->ctxt == NULL)
-        throw xml::ENoMemory();
+        throw std::bad_alloc();
 }
 
@@ -1148 +1148 @@
         delete ctxt;
 
-        throw xml::ENoMemory();
+        throw std::bad_alloc();
     }
     catch (const xml::EIPRTFailure &err) { sThat->m->trappedErr.reset (stdx::new_exception_trap (err)); }