Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 119310 preferences + open in new tab + clicking browser crashes @nsLoadGroup::RemoveRequest

Browse Source 
assert instead of crashing if some load fails
r=darin sr=waterson


git-svn-id: svn://10.0.0.236/trunk@112243 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mac.com
2002-01-16 00:16:51 +00:00
parent 9f23c83c58
commit 85980b3c4a
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/content/xul/document/src/nsXULDocument.cpp
View File

@@ -5950,16 +5950,18 @@ nsXULDocument::ResumeWalk()
nsIDocumentObserver* observer = (nsIDocumentObserver*) mObservers[i];
observer->EndLoad(this);
}
NS_ASSERTION(mPlaceHolderRequest, "Bug 119310, perhaps overlayinfo referenced a overlay that doesn't exist");
if (mPlaceHolderRequest) {
// Remove the placeholder channel; if we're the last channel in the
// load group, this will fire the OnEndDocumentLoad() method in the
// docshell, and run the onload handlers, etc.
nsCOMPtr<nsILoadGroup> group = do_QueryReferent(mDocumentLoadGroup);
if (group) {
rv = group->RemoveRequest(mPlaceHolderRequest, nsnull, NS_OK);
if (NS_FAILED(rv)) return rv;
// Remove the placeholder channel; if we're the last channel in the
// load group, this will fire the OnEndDocumentLoad() method in the
// docshell, and run the onload handlers, etc.
nsCOMPtr<nsILoadGroup> group = do_QueryReferent(mDocumentLoadGroup);
if (group) {
rv = group->RemoveRequest(mPlaceHolderRequest, nsnull, NS_OK);
if (NS_FAILED(rv)) return rv;
mPlaceHolderRequest = nsnull;
mPlaceHolderRequest = nsnull;
}
}
return rv;
}

4
mozilla/htmlparser/src/nsParser.cpp
View File

@@ -1380,9 +1380,9 @@ nsresult nsParser::DidBuildModel(nsresult anErrorCode) {
nsresult result=anErrorCode;
if (IsComplete()) {
if(mParserContext && !mParserContext->mPrevContext) {
if (mParserContext && !mParserContext->mPrevContext) {
if (mParserContext->mDTD) {
result = mParserContext->mDTD->DidBuildModel(anErrorCode,PRBool(0==mParserContext->mPrevContext),this,mSink);
result = mParserContext->mDTD->DidBuildModel(anErrorCode,PR_TRUE,this,mSink);
}
//Ref. to bug 61462.
mParserContext->mRequest = 0;

1
mozilla/netwerk/base/src/nsLoadGroup.cpp
View File

@@ -482,6 +482,7 @@ nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt)
NS_IMETHODIMP
nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt, nsresult aStatus)
{
NS_ENSURE_ARG_POINTER(request);
nsresult rv;
#if defined(PR_LOGGING)

4
mozilla/parser/htmlparser/src/nsParser.cpp
View File

@@ -1380,9 +1380,9 @@ nsresult nsParser::DidBuildModel(nsresult anErrorCode) {
nsresult result=anErrorCode;
if (IsComplete()) {
if(mParserContext && !mParserContext->mPrevContext) {
if (mParserContext && !mParserContext->mPrevContext) {
if (mParserContext->mDTD) {
result = mParserContext->mDTD->DidBuildModel(anErrorCode,PRBool(0==mParserContext->mPrevContext),this,mSink);
result = mParserContext->mDTD->DidBuildModel(anErrorCode,PR_TRUE,this,mSink);
}
//Ref. to bug 61462.
mParserContext->mRequest = 0;