Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 18:50:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Crash fix: Use the current proto-doc's global object, not the possibly-null window global, when compiling overlay out-of-line scripts (204935, r=ben, sr=jst).

Browse Source
This commit is contained in:
brendan%mozilla.org 2003-05-30 06:30:27 +00:00
parent 8fa1bb278e
commit eec1202138
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/xul/document/src/nsXULDocument.cpp
View File

@ -112,6 +112,8 @@
#include "nsIPref.h"
#include "nsIFocusController.h"
#include "nsContentList.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIScriptSecurityManager.h"
//----------------------------------------------------------------------
@ -3389,10 +3391,18 @@ nsXULDocument::OnStreamComplete(nsIStreamLoader* aLoader,
// Ignore the return value, as we don't need to propagate
// a failure to write to the FastLoad file, because this
// method aborts that whole process on error.
nsCOMPtr<nsIScriptContext> scriptContext;
mScriptGlobalObject->GetContext(getter_AddRefs(scriptContext));
if (scriptContext)
scriptProto->SerializeOutOfLine(nsnull, scriptContext);
nsCOMPtr<nsIScriptGlobalObjectOwner> globalOwner
= do_QueryInterface(mCurrentPrototype);
nsCOMPtr<nsIScriptGlobalObject> global;
globalOwner->GetScriptGlobalObject(getter_AddRefs(global));
NS_ASSERTION(global != nsnull, "master prototype w/o global?!");
if (global) {
nsCOMPtr<nsIScriptContext> scriptContext;
global->GetContext(getter_AddRefs(scriptContext));
if (scriptContext)
scriptProto->SerializeOutOfLine(nsnull, scriptContext);
}
}
}
// ignore any evaluation errors