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

36082: don't load contents of script tag if script evaluation is off. r=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@78786 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
akkana%netscape.com 2000-09-11 22:27:53 +00:00
parent 1debe0939e
commit ef8556bca9
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/content/html/document/src/nsHTMLContentSink.cpp
View File

@ -4884,8 +4884,20 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
MOZ_TIMER_STOP(mWatch);
// Don't process scripts that aren't JavaScript and don't process
// scripts that are inside iframes, noframe, or noscript tags.
if (isJavaScript && !mNumOpenIFRAMES && !mInsideNoXXXTag) {
// scripts that are inside iframes, noframe, or noscript tags,
// or if the script context has script evaluation disabled:
PRBool scriptsEnabled = PR_TRUE;
nsCOMPtr<nsIScriptGlobalObject> globalObject;
mDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
if (globalObject)
{
nsCOMPtr<nsIScriptContext> context;
if (NS_SUCCEEDED(globalObject->GetContext(getter_AddRefs(context)))
&& context)
context->GetScriptsEnabled(&scriptsEnabled);
}
if (scriptsEnabled && isJavaScript && !mNumOpenIFRAMES && !mInsideNoXXXTag) {
mScriptLanguageVersion = jsVersionString;
// If there is a SRC attribute...

16
mozilla/layout/html/document/src/nsHTMLContentSink.cpp
View File

@ -4884,8 +4884,20 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
MOZ_TIMER_STOP(mWatch);
// Don't process scripts that aren't JavaScript and don't process
// scripts that are inside iframes, noframe, or noscript tags.
if (isJavaScript && !mNumOpenIFRAMES && !mInsideNoXXXTag) {
// scripts that are inside iframes, noframe, or noscript tags,
// or if the script context has script evaluation disabled:
PRBool scriptsEnabled = PR_TRUE;
nsCOMPtr<nsIScriptGlobalObject> globalObject;
mDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
if (globalObject)
{
nsCOMPtr<nsIScriptContext> context;
if (NS_SUCCEEDED(globalObject->GetContext(getter_AddRefs(context)))
&& context)
context->GetScriptsEnabled(&scriptsEnabled);
}
if (scriptsEnabled && isJavaScript && !mNumOpenIFRAMES && !mInsideNoXXXTag) {
mScriptLanguageVersion = jsVersionString;
// If there is a SRC attribute...