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

Timestamp:

Apr 22, 2009 9:08:07 AM (16 years ago)

Author:

vboxsync

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

46259

Message:

VBoxXPCOMC: fixed memory leak as ppSession & ppVirtualBox were not being stored.

File:

• trunk/src/VBox/Main/cbinding/VBoxXPCOMC.cpp (modified) (4 diffs)

trunk/src/VBox/Main/cbinding/VBoxXPCOMC.cpp

@@ -37 +37 @@
 static ISession            *Session        = NULL;
 static IVirtualBox         *Ivirtualbox    = NULL;
-static nsIServiceManager   *serviceManager = NULL;
 static nsIComponentManager *manager        = NULL;
 static nsIEventQueue       *eventQ         = NULL;
@@ -84 +83 @@
     *ppSession    = NULL;
     *ppVirtualBox = NULL;
-
-    /** @todo r=bird: what exactly is this supposed to acomplish? */
-    Session     = *ppSession;
-    Ivirtualbox = *ppVirtualBox;
 
     rc = com::Initialize();
@@ -138 +133 @@
 
     Log(("Cbinding: ISession object created.\n"));
+
+    /* Store ppSession & ppVirtualBox so that VBoxComUninitialize
+     * can later take care of them while cleanup
+     */
+    Session     = *ppSession;
+    Ivirtualbox = *ppVirtualBox;
+
 }
 
@@ -159 +161 @@
     if (manager)
         NS_RELEASE(manager);        // decrement refcount
-    if (serviceManager)
-        NS_RELEASE(serviceManager); // decrement refcount
     com::Shutdown();
     Log(("Cbinding: Cleaned up the created IVirtualBox and ISession Objects.\n"));