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 834732 - Assert proper cx stack handling in WrapperFactory::Rewrap. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2013-02-26 11:04:13 -08:00
parent d1a3436036
commit 2473e41a58
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/xpconnect/src/XPCWrappedJSClass.cpp
View File

@ -492,6 +492,7 @@ nsXPCWrappedJSClass::IsWrappedJS(nsISupports* aPtr)
result == WrappedJSIdentity::GetSingleton(); result == WrappedJSIdentity::GetSingleton();
} }
// NB: This returns null unless there's nothing on the JSContext stack.
static JSContext * static JSContext *
GetContextFromObject(JSObject *obj) GetContextFromObject(JSObject *obj)
{ {

6
js/xpconnect/wrappers/WrapperFactory.cpp
View File

@ -285,8 +285,7 @@ DEBUG_CheckUnwrapSafety(JSObject *obj, js::Wrapper *handler,
MOZ_ASSERT(!handler->isSafeToUnwrap()); MOZ_ASSERT(!handler->isSafeToUnwrap());
} else if (AccessCheck::needsSystemOnlyWrapper(obj)) { } else if (AccessCheck::needsSystemOnlyWrapper(obj)) {
// SOWs are opaque to everyone but Chrome and XBL scopes. // SOWs are opaque to everyone but Chrome and XBL scopes.
// FIXME: Re-enable in bug 834732. MOZ_ASSERT(handler->isSafeToUnwrap() == nsContentUtils::CanAccessNativeAnon());
// MOZ_ASSERT(handler->isSafeToUnwrap() == nsContentUtils::CanAccessNativeAnon());
} else { } else {
// Otherwise, it should depend on whether the target subsumes the origin. // Otherwise, it should depend on whether the target subsumes the origin.
MOZ_ASSERT(handler->isSafeToUnwrap() == AccessCheck::subsumes(target, origin)); MOZ_ASSERT(handler->isSafeToUnwrap() == AccessCheck::subsumes(target, origin));
@ -342,6 +341,9 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *existing, JSObject *obj,
"wrapped object passed to rewrap"); "wrapped object passed to rewrap");
MOZ_ASSERT(JS_GetClass(obj) != &XrayUtils::HolderClass, "trying to wrap a holder"); MOZ_ASSERT(JS_GetClass(obj) != &XrayUtils::HolderClass, "trying to wrap a holder");
MOZ_ASSERT(!js::IsInnerObject(obj)); MOZ_ASSERT(!js::IsInnerObject(obj));
// We sometimes end up here after nsContentUtils has been shut down but before
// XPConnect has been shut down, so check the context stack the roundabout way.
MOZ_ASSERT(XPCJSRuntime::Get()->GetJSContextStack()->Peek() == cx);
// Compute the information we need to select the right wrapper. // Compute the information we need to select the right wrapper.
JSCompartment *origin = js::GetObjectCompartment(obj); JSCompartment *origin = js::GetObjectCompartment(obj);