Changeset 31372 in vbox for trunk/src/VBox

Timestamp:

Aug 4, 2010 7:01:08 PM (15 years ago)

Author:

vboxsync

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

64429

Message:

Main: fix memory leak in VirtualBox::postEvent() when posting the event fails

File:

• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1933 +1933 @@
  *  method call.
  *
- *  @param event    event to post
- *                  (must be allocated using |new|, will be deleted automatically
- *                  by the event thread after processing)
+ *  @param event    event to post; must have been allocated using |new|, will
+ *                  be deleted automatically by the event thread after processing
  *
  *  @note Doesn't lock any object.
@@ -1941 +1940 @@
 HRESULT VirtualBox::postEvent(Event *event)
 {
-    AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
-
-    if (autoCaller.state() != Ready)
-    {
-        LogWarningFunc(("VirtualBox has been uninitialized (state=%d), the event is discarded!\n",
-                        autoCaller.state()));
-        return S_OK;
-    }
-
     AssertReturn(event, E_FAIL);
-    AssertReturn(m->pAsyncEventQ, E_FAIL);
-
-    if (m->pAsyncEventQ->postEvent(event))
-        return S_OK;
-
-    return E_FAIL;
+
+    HRESULT rc;
+    AutoCaller autoCaller(this);
+    if (SUCCEEDED((rc = autoCaller.rc())))
+    {
+        if (autoCaller.state() != Ready)
+            LogWarningFunc(("VirtualBox has been uninitialized (state=%d), the event is discarded!\n",
+                            autoCaller.state()));
+            // return S_OK
+        else if (    (m->pAsyncEventQ)
+                  && (m->pAsyncEventQ->postEvent(event))
+                )
+            return S_OK;
+        else
+            rc = E_FAIL;
+    }
+
+    // in any event of failure, we must clean up here, or we'll leak;
+    // the caller has allocated the object using new()
+    delete event;
+    return rc;
 }