Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 19:41:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Push the JSContext we're going to run the javascript: URL in on the stack

Browse Source 
before doing anything else.  Bug 363594, r+sr=jst
This commit is contained in:
bzbarsky%mit.edu 2006-12-13 15:52:55 +00:00
parent e1973f01bc
commit d8d349dea3
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/src/jsurl/nsJSProtocolHandler.cpp
View File

@ -73,7 +73,7 @@
#include "nsContentUtils.h"
#include "nsJSUtils.h"
#include "nsThreadUtils.h"
#include "nsIJSContextStack.h"
class nsJSThunk : public nsIInputStream
{
@ -278,6 +278,18 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
return rv;
}
// Push our JSContext on the context stack so the JS_ValueToString call (and
// JS_ReportPendingException, if relevant) will use the principal of cx.
// Note that we do this as late as possible to make popping simpler.
nsCOMPtr<nsIJSContextStack> stack =
do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
if (NS_SUCCEEDED(rv)) {
rv = stack->Push(cx);
}
if (NS_FAILED(rv)) {
return rv;
}
rv = xpc->EvalInSandboxObject(NS_ConvertUTF8toUTF16(script), cx,
sandbox, &rval);
@ -307,6 +319,8 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
result = nsDependentJSString(str);
}
}
stack->Pop(nsnull);
} else {
// No need to use the sandbox, evaluate the script directly in
// the given scope.