Changeset 21428 in vbox for trunk

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

Files:

• include/iprt/xml_cpp.h (modified) (2 diffs)
• src/VBox/Main/MachineImpl.cpp (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)
• src/VBox/Runtime/r3/xml.cpp (modified) (10 diffs)

trunk/include/iprt/xml_cpp.h

@@ -122 +122 @@
     XmlError(xmlErrorPtr aErr);
 
-    static char *Format(xmlErrorPtr aErr);
+    static char* Format(xmlErrorPtr aErr);
 };
 
@@ -158 +158 @@
 // Runtime errors
 //////////////////////////////////////////////////////////////////////////////
-
-class RT_DECL_CLASS ENoMemory : public RuntimeError, public std::bad_alloc
-{
-public:
-    ENoMemory(const char *aMsg = NULL) : RuntimeError (aMsg) {}
-    virtual ~ENoMemory() throw() {}
-};
 
 class RT_DECL_CLASS EIPRTFailure : public RuntimeError

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)); }

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -168 +168 @@
 {
     Data()
-        : fileName (NULL), handle (NIL_RTFILE), opened (false) {}
-
-    char *fileName;
+        : handle(NIL_RTFILE), opened(false)
+    { }
+
+    iprt::MiniString strFileName;
     RTFILE handle;
     bool opened : 1;
@@ -176 +177 @@
 
 File::File(Mode aMode, const char *aFileName)
-    : m (new Data())
-{
-    m->fileName = RTStrDup (aFileName);
-    if (m->fileName == NULL)
-        throw ENoMemory();
+    : m(new Data())
+{
+    m->strFileName = aFileName;
 
     unsigned flags = 0;
@@ -205 +204 @@
 }
 
-File::File (RTFILE aHandle, const char *aFileName /* = NULL */)
-    : m (new Data())
+File::File(RTFILE aHandle, const char *aFileName /* = NULL */)
+    : m(new Data())
 {
     if (aHandle == NIL_RTFILE)
@@ -214 +213 @@
 
     if (aFileName)
-    {
-        m->fileName = RTStrDup (aFileName);
-        if (m->fileName == NULL)
-            throw ENoMemory();
-    }
+        m->strFileName = aFileName;
 
     setPos (0);
@@ -226 +221 @@
 {
     if (m->opened)
-        RTFileClose (m->handle);
-
-    RTStrFree (m->fileName);
-}
-
-const char *File::uri() const
-{
-    return m->fileName;
+        RTFileClose(m->handle);
+}
+
+const char* File::uri() const
+{
+    return m->strFileName.c_str();
 }
 
@@ -796 +789 @@
     if (!(plibNode = xmlNewNode(NULL,        // namespace
                                 (const xmlChar*)pcszElementName)))
-        throw ENoMemory();
+        throw std::bad_alloc();
     xmlAddChild(m->plibNode, plibNode);
 
@@ -823 +816 @@
     xmlNode *plibNode;
     if (!(plibNode = xmlNewText((const xmlChar*)pcszContent)))
-        throw ENoMemory();
+        throw std::bad_alloc();
     xmlAddChild(m->plibNode, plibNode);
 
@@ -1046 +1039 @@
     if (!(plibRootNode = xmlNewNode(NULL,        // namespace
                                     (const xmlChar*)pcszRootElementName)))
-        throw ENoMemory();
+        throw std::bad_alloc();
     xmlDocSetRootElement(m->plibDocument, plibRootNode);
 
@@ -1067 +1060 @@
     m_ctxt = xmlNewParserCtxt();
     if (m_ctxt == NULL)
-        throw ENoMemory();
+        throw std::bad_alloc();
 }
 
@@ -1090 +1083 @@
     {
         if (!(ctxt = xmlNewParserCtxt()))
-            throw xml::ENoMemory();
+            throw std::bad_alloc();
     }