Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 884334 - Make sure WidgetShutdownObserver doesn't attempt to use the widget pointer after it has been destroyed. r=roc

Browse Source
This commit is contained in:
Matt Woodrow 2013-06-19 14:21:01 +12:00
parent 9e8bcc1d69
commit f84e41801b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/xpwidgets/nsBaseWidget.cpp
View File

@ -130,7 +130,8 @@ WidgetShutdownObserver::Observe(nsISupports *aSubject,
const char *aTopic,
const PRUnichar *aData)
{
if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0 &&
mWidget) {
mWidget->Shutdown();
nsContentUtils::UnregisterShutdownObserver(this);
}
@ -195,6 +196,11 @@ nsBaseWidget::~nsBaseWidget()
}
if (mShutdownObserver) {
// If the shutdown observer is currently processing observers,
// then UnregisterShutdownObserver won't stop our Observer
// function from being called. Make sure we don't try
// to reference the dead widget.
mShutdownObserver->mWidget = nullptr;
nsContentUtils::UnregisterShutdownObserver(mShutdownObserver);
}

1
widget/xpwidgets/nsBaseWidget.h
View File

@ -51,7 +51,6 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
private:
nsBaseWidget *mWidget;
};