Bug 590546 - Incubator embedding: [@ ConsoleListener::Observe] crashes on MozView destroy r=mark.finkle

tmeshkova · tmeshkova · commit 9421d81c218c · 2010-08-25T11:46:21.000-07:00
diff --git a/common/embed.cpp b/common/embed.cpp
@@ -301,6 +301,7 @@ MozView::MozView()
 MozView::~MozView()
 {
     delete mPrivate;
+    mPrivate = NULL;
     TermEmbedding();
 }
 
@@ -489,6 +490,9 @@ void MozView::SetListener(MozViewListener *aNewListener)
 
 MozViewListener* MozView::GetListener()
 {
+    if (!mPrivate)
+        return NULL;
+
     return mPrivate->mListener;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,7 @@ MozView::MozView()`
`301`	`301`	`MozView::~MozView()`
`302`	`302`	`{`
`303`	`303`	`delete mPrivate;`
	`304`	`+ mPrivate = NULL;`
`304`	`305`	`TermEmbedding();`
`305`	`306`	`}`
`306`	`307`
`@@ -489,6 +490,9 @@ void MozView::SetListener(MozViewListener *aNewListener)`
`489`	`490`
`490`	`491`	`MozViewListener* MozView::GetListener()`
`491`	`492`	`{`
	`493`	`+ if (!mPrivate)`
	`494`	`+ return NULL;`
	`495`	`+`
`492`	`496`	`return mPrivate->mListener;`
`493`	`497`	`}`
`494`	`498`