Changeset 26439 in vbox

Timestamp:

Feb 11, 2010 3:38:12 PM (15 years ago)

Author:

vboxsync

Message:

Frontends/SDL+Headless: fix VirtualBox callback registration leak

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (3 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (9 diffs)

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

@@ -832 +832 @@
     ComPtr<ISession> session;
     bool fSessionOpened = false;
+    VirtualBoxCallback *vboxCallback = NULL;
 
     do
@@ -1018 +1019 @@
 
         /* VirtualBox callback registration. */
-        VirtualBoxCallback *vboxCallback = new VirtualBoxCallback();
+        vboxCallback = new VirtualBoxCallback();
         vboxCallback->AddRef();
         CHECK_ERROR(virtualBox, RegisterCallback(vboxCallback));
@@ -1142 +1143 @@
     while (0);
 
+    /* VirtualBox callback unregistration. */
+    if (vboxCallback)
+    {
+        vboxCallback->AddRef();
+        CHECK_ERROR(virtualBox, UnregisterCallback(vboxCallback));
+        vboxCallback->Release();
+    }
+
     /* No more access to the 'console' object, which will be uninitialized by the next session->Close call. */
     gConsole = NULL;

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1393 +1393 @@
     }
 
-    do
+    /* NOTE: do not convert the following scope to a "do {} while (0);", as
+     * this would make it all too tempting to use "break;" incorrectly - it
+     * would skip over the cleanup. */
     {
     // scopes all the stuff till shutdown
@@ -1401 +1403 @@
     ComPtr <ISession> session;
     bool sessionOpened = false;
+    EventQueue* eventQ = com::EventQueue::getMainEventQueue();
 
     rc = virtualBox.createLocalObject (CLSID_VirtualBox);
@@ -1411 +1414 @@
         else
             RTPrintf("Failed to create VirtualBox object! No error information available (rc = 0x%x).\n", rc);
-        break;
+        goto leave;
     }
     rc = session.createInprocObject (CLSID_Session);
@@ -1417 +1420 @@
     {
         RTPrintf("Failed to create session object, rc = 0x%x!\n", rc);
-        break;
-    }
-
-    EventQueue* eventQ = com::EventQueue::getMainEventQueue();
+        goto leave;
+    }
 
     /*
@@ -1752 +1753 @@
 
             ComPtr<ISnapshot> pCurrentSnapshot;
-            CHECK_ERROR_BREAK(gMachine, COMGETTER(CurrentSnapshot)(pCurrentSnapshot.asOutParam()));
+            CHECK_ERROR(gMachine, COMGETTER(CurrentSnapshot)(pCurrentSnapshot.asOutParam()));
+            if (FAILED(rc))
+                goto leave;
 
             CHECK_ERROR(gConsole, RestoreSnapshot(pCurrentSnapshot, gProgress.asOutParam()));
@@ -2757 +2760 @@
            )
        )
+    do
     {
         cbConsoleImpl->ignorePowerOffEvents(true);
-        ComPtr <IProgress> progress;
+        ComPtr<IProgress> progress;
         CHECK_ERROR_BREAK(gConsole, PowerDown(progress.asOutParam()));
-        CHECK_ERROR_BREAK (progress, WaitForCompletion (-1));
+        CHECK_ERROR_BREAK(progress, WaitForCompletion(-1));
         BOOL completed;
-        CHECK_ERROR_BREAK (progress, COMGETTER(Completed) (&completed));
+        CHECK_ERROR_BREAK(progress, COMGETTER(Completed)(&completed));
         ASSERT (completed);
         LONG hrc;
-        CHECK_ERROR_BREAK (progress, COMGETTER(ResultCode) (&hrc));
+        CHECK_ERROR_BREAK(progress, COMGETTER(ResultCode)(&hrc));
         if (FAILED(hrc))
         {
@@ -2777 +2781 @@
             break;
         }
-    }
+    } while (0);
 
     /*
@@ -2866 +2870 @@
         RTLdrClose(gLibrarySDL_ttf);
 #endif
+
+    /* VirtualBox callback unregistration. */
+    if (!virtualBox.isNull() && !callback.isNull())
+        virtualBox->UnregisterCallback(callback);
+
     LogFlow(("Releasing machine, session...\n"));
     gMachine = NULL;
@@ -2875 +2884 @@
     ////////////////////////////////////////////////////////////////////////////
     }
-    while (0);
 
     /* Must be before com::Shutdown() */