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 532124 - Set aside the frame chain when wrapping for chrome so we don't get confused by any content code on the stack. r=jst

Browse Source
This commit is contained in:
Blake Kaplan 2009-12-11 10:33:32 -08:00
parent b7cbf88c7e
commit 91fd0fb306
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/xpconnect/src/XPCChromeObjectWrapper.cpp
View File

@ -451,15 +451,27 @@ XPC_COW_RewrapForChrome(JSContext *cx, JSObject *wrapperObj, jsval *vp)
}
XPCWrappedNative *wn;
JSBool ok;
// Set aside the frame chain so that we'll be able to wrap this object for
// chrome's use.
JSStackFrame *fp = JS_SaveFrameChain(cx);
if (IS_WN_WRAPPER(obj) &&
(wn = (XPCWrappedNative*)xpc_GetJSPrivate(obj)) &&
!nsXPCWrappedJSClass::IsWrappedJS(wn->Native())) {
// Return an explicit XPCNativeWrapper in case "chrome" code happens to be
// XBL code cloned into an untrusted context.
return XPCNativeWrapper::CreateExplicitWrapper(cx, wn, JS_TRUE, vp);
ok = XPCNativeWrapper::CreateExplicitWrapper(cx, wn, JS_TRUE, vp);
} else {
// Note: we're passing the wrapped chrome object as the scope for the SJOW.
ok = XPCSafeJSObjectWrapper::WrapObject(cx, GetWrappedObject(cx, wrapperObj),
*vp, vp);
}
return XPCSafeJSObjectWrapper::WrapObject(cx, obj, *vp, vp);
JS_RestoreFrameChain(cx, fp);
return ok;
}
JSBool

23
js/src/xpconnect/tests/mochitest/test_cows.html
View File

@ -35,6 +35,13 @@ sandbox.getCOW = getCOW;
const TEST_API = ['is', 'isnot', 'ok', 'todo_is', 'todo_isnot', 'todo'];
TEST_API.forEach(function(name) { sandbox[name] = window[name]; });
sandbox.alienObject = test_utils.getCOWForObject(sandbox, {
__exposedProps__: {funProp: 'r'},
funProp: function foo(x) {
return x + 1;
}
});
function COWTests() {
// This function is actually decompiled and run inside a
// sandbox with content privileges.
@ -149,6 +156,22 @@ function COWTests() {
} catch (e) {
ok(false, "Readable function exposed props should be callable" + e);
}
try {
is(alienObject.funProp(1), 2,
"COWs wrapping objects from different principals should work");
} catch (e) {
ok(false, "COWs wrapping objs from different principals " +
"shouldn't throw " + e);
}
try {
is(alienObject.funProp(1), 2,
"COWs wrapping objs from different principals should work twice");
} catch (e) {
ok(false, "COWs wrapping objs from different principals " +
"shouldn't throw on second access but not first: " + e);
}
}
// Decompile the COW test suite, re-evaluate it in the sandbox and execute it.