Changeset 22188 in vbox for trunk/src/VBox

Timestamp:

Aug 11, 2009 6:06:11 PM (15 years ago)

Author:

vboxsync

Message:

Main: fix crash if VirtualBox.xml is not present.

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (3 diffs)
• xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -31 +31 @@
 #include <iprt/env.h>
 #include <iprt/cpputils.h>
+#include <iprt/xml_cpp.h>
 
 #include <VBox/com/com.h>
@@ -164 +165 @@
                                                 VBOX_GLOBAL_SETTINGS_FILE);
     HRESULT rc = S_OK;
+    bool fCreate = false;
     try
     {
         // load and parse VirtualBox.xml; this will throw on XML or logic errors
         m_pMainConfigFile = new settings::MainConfigFile(&m_strSettingsFilePath);
-
-        // either a) valid XML file loaded or b) file not found and defaults loaded:
-        // now construct our global objects from that data
+    }
+    catch (xml::EIPRTFailure &e)
+    {
+        // this is thrown by the XML backend if the RTOpen() call fails;
+        // only if the main settings file does not exist, create it,
+        // if there's something more serious, then do fail!
+        if (e.rc() == VERR_FILE_NOT_FOUND)
+            fCreate = true;
+    }
+    catch (HRESULT err)
+    {
+        /* we assume that error info is set by the thrower */
+        rc = err;
+    }
+    catch (...)
+    {
+        rc = VirtualBox::handleUnexpectedExceptions(RT_SRC_POS);
+    }
+
+    try
+    {
+        if (fCreate)
+            m_pMainConfigFile = new settings::MainConfigFile(NULL);
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
@@ -2986 +3008 @@
 
         // now write out the XML
-        m_pMainConfigFile->write();
+        m_pMainConfigFile->write(m_strSettingsFilePath);
     }
     catch (HRESULT err)

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

@@ -786 +786 @@
  * builds an XML DOM tree and writes it out to disk.
  */
-void MainConfigFile::write()
-{
+void MainConfigFile::write(const com::Utf8Str strFilename)
+{
+    m->strFilename = strFilename;
     createStubDocument();
 
@@ -1952 +1953 @@
 {
     m->strFilename = strFilename;
-
     createStubDocument();