Fix for anchors that try and load content into a docshell that has already been destroyed. b=94229 r=ccarlen@netscape.com sr=rpotts@netscape.com

git-svn-id: svn://10.0.0.236/trunk@101446 18797224-902f-48f8-a5cc-f745e15eee43
2001-08-21 00:50:26 +00:00
parent 887b433600
commit ecfed0d85b
1 changed files with 7 additions and 3 deletions
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -4114,7 +4114,6 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                         PRUint32 aLoadType,
                         nsISHEntry * aSHEntry)
 {
-
    nsresult rv;

    nsCOMPtr<nsISupports> owner(aOwner);
@@ -4263,8 +4262,13 @@ nsDocShell::InternalLoad(nsIURI * aURI,
        return rv;
    }

-    
-    
+    //
+    // Load is being targetted at this docshell so return an error if the
+    // docshell is in the process of being destroyed.
+    //
+    if (mIsBeingDestroyed) {
+        return NS_ERROR_FAILURE;
+	}
    
    mURIResultedInDocument = PR_FALSE;  // reset the clock...
    mLSHE = aSHEntry;