wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 832435 - Fix compartment handling for EvaluteString and javascript: uris. r=bzbarsky

Browse Source
This commit is contained in:
Bobby Holley 2013-01-18 23:33:26 -05:00
parent 889e1ea478
commit cf97537345
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/test/Makefile.in
View File

@ -165,6 +165,7 @@ _BROWSER_FILES = \
browser_bug749738.js \
browser_bug783614.js \
browser_bug797677.js \
browser_bug832435.js \
browser_canonizeURL.js \
browser_customize.js \
browser_findbarClose.js \

19
browser/base/content/test/browser_bug832435.js Normal file
View File

@ -0,0 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
function test() {
waitForExplicitFinish();
ok(true, "Starting up");
gBrowser.selectedBrowser.focus();
gURLBar.addEventListener("focus", function onFocus() {
gURLBar.removeEventListener("focus", onFocus);
ok(true, "Invoked onfocus handler");
EventUtils.synthesizeKey("VK_RETURN", { shiftKey: true });
ok(true, "Evaluated without crashing");
finish();
});
gURLBar.inputField.value = "javascript: document.body.innerHTML = '11111111'); ";
gURLBar.focus();
}

3
dom/base/nsJSEnvironment.cpp
View File

@ -1293,6 +1293,9 @@ nsJSContext::EvaluateString(const nsAString& aScript,
pusher.Pop();
ScriptEvaluated(true);
// Wrap the return value into whatever compartment mContext was in.
if (!JS_WrapValue(mContext, aRetValue))
return NS_ERROR_OUT_OF_MEMORY;
return NS_OK;
}

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

@ -340,6 +340,12 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
::JS_ReportPendingException(cx);
}
// If we took the sandbox path above, v might be in the sandbox
// compartment.
if (!JS_WrapValue(cx, &v)) {
return NS_ERROR_OUT_OF_MEMORY;
}
if (NS_FAILED(rv)) {
rv = NS_ERROR_MALFORMED_URI;
}