Changeset 25027 in vbox

Timestamp:

Nov 26, 2009 5:59:32 PM (15 years ago)

Author:

vboxsync

Message:

VBoxHeadless: properly close session if the VM failed to start (xTracker 4495).

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -659 +659 @@
     }
 
+    ComPtr<IVirtualBox> virtualBox;
+    ComPtr<ISession> session;
+    bool fSessionOpened = false;
+
     do
     {
-        ComPtr<IVirtualBox> virtualBox;
-        ComPtr<ISession> session;
-
         rc = virtualBox.createLocalObject(CLSID_VirtualBox);
         if (FAILED(rc))
@@ -708 +709 @@
         // open a session
         CHECK_ERROR_BREAK(virtualBox, OpenSession (session, id));
+        fSessionOpened = true;
 
         /* get the console */
@@ -762 +764 @@
         if (rc != S_OK)
         {
-            return -1;
+            break;
         }
 #endif /* defined(VBOX_FFMPEG) */
@@ -784 +786 @@
             {
                 RTPrintf("Error: could not create framebuffer object %d\n", uScreenId);
-                return -1;
+                break;
             }
             pVRDPFramebuffer->AddRef();
             display->SetFramebuffer(uScreenId, pVRDPFramebuffer);
+        }
+        if (uScreenId < cMonitors)
+        {
+            break;
         }
 #endif
@@ -955 +961 @@
 
         /* we don't have to disable VRDP here because we don't save the settings of the VM */
-
+    }
+    while (0);
+
+    if (fSessionOpened)
+    {
         /*
          * Close the session. This will also uninitialize the console and
@@ -963 +973 @@
         session->Close();
     }
-    while (0);
+
+    /* Must be before com::Shutdown */
+    session.setNull();
+    virtualBox.setNull();
 
     com::Shutdown();