Bug 592144 - Incubator Embedding: ConsoleListener crashes [@ MozView::GetListener] when tries to access already destroyed owner r=mark.finkle

Author: tmeshkova

common/ConsoleListener.cpp

@@ -20,6 +20,7 @@
  * Contributor(s):
  *   Tobias Hunger <[email protected]>
  *   Steffen.Imhof <[email protected]>
+ *   Tatiana Meshkova <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -50,8 +51,16 @@ ConsoleListener::ConsoleListener(MozView *aOwner) :
 ConsoleListener::~ConsoleListener()
 { }
 
+void ConsoleListener::Detach()
+{
+    mOwner = NULL;
+}
+
 NS_IMETHODIMP ConsoleListener::Observe(nsIConsoleMessage * aMessage)
 {
+    if (!mOwner)
+        return NS_OK;
+
     MozViewListener *listener = mOwner->GetListener();
     if (!listener)
         return NS_OK;

common/ConsoleListener.h

@@ -18,6 +18,7 @@
  * Contributor(s):
  *   Tobias Hunger <[email protected]>
  *   Steffen Imhof <[email protected]>
+ *   Tatiana Meshkova <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -48,6 +49,8 @@ class ConsoleListener : public nsIConsoleListener
     ConsoleListener(MozView *aOwner);
     virtual ~ConsoleListener();
 
+    void Detach();
+
     NS_DECL_ISUPPORTS
     NS_DECL_NSICONSOLELISTENER
 

common/embed.cpp

@@ -196,6 +196,7 @@ class MozView::Private
 
         mContentListener = 0;
         mDOMEventListener = 0;
+        mConsoleListener->Detach();
         mConsoleListener = 0;
         mWebNavigation = 0;
         mDOMWindow = 0;
@@ -217,7 +218,7 @@ class MozView::Private
     nsCOMPtr<nsIWebBrowserChrome> mChrome;
     nsCOMPtr<nsIURIContentListener> mContentListener;
     nsCOMPtr<nsIDOMEventListener> mDOMEventListener;
-    nsCOMPtr<nsIConsoleListener> mConsoleListener;
+    nsCOMPtr<ConsoleListener> mConsoleListener;
 };
 
 class WindowCreator : public nsIWindowCreator2