From a2a2cad1f55ea5ac12728fbdf20dc9b05abdd306 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Wed, 11 Jan 2006 03:26:42 +0000 Subject: [PATCH] Bug 318276: Crash [ @ nsXULDocument::LoadOverlay ], patch by Jeff Walden , r+sr=jst, a=dveditz git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@187307 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xul/document/src/nsXULDocument.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 1d049c8a667..612daad9bab 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -2673,8 +2673,8 @@ nsXULDocument::LoadOverlay(const nsAString& aURL, nsIObserver* aObserver) } PRBool shouldReturn; rv = LoadOverlayInternal(uri, PR_TRUE, &shouldReturn); - if (NS_FAILED(rv)) - mOverlayLoadObservers.Remove(uri); // remove the observer if LoadOverlayInternal generated an error + if (NS_FAILED(rv) && mOverlayLoadObservers.IsInitialized()) + mOverlayLoadObservers.Remove(uri); // remove the observer if LoadOverlayInternal generated an error return rv; }