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 979481 - Make the SafeJSContext default to a null compartment, and have AutoSafeJSContext enter the compartment instead. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2014-03-26 10:59:03 -03:00
parent b999e7ea65
commit 655ad8ddf4
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsfriendapi.cpp
View File

@ -412,6 +412,8 @@ js::AssertSameCompartment(JSObject *objA, JSObject *objB)
JS_FRIEND_API(JSObject *) JS_FRIEND_API(JSObject *)
js::DefaultObjectForContextOrNull(JSContext *cx) js::DefaultObjectForContextOrNull(JSContext *cx)
{ {
if (cx->options().noDefaultCompartmentObject())
return nullptr;
return cx->maybeDefaultCompartmentObject(); return cx->maybeDefaultCompartmentObject();
} }

5
js/xpconnect/src/XPCJSContextStack.cpp
View File

@ -175,6 +175,7 @@ XPCJSContextStack::InitSafeJSContext()
if (!mSafeJSContext) if (!mSafeJSContext)
MOZ_CRASH(); MOZ_CRASH();
JSAutoRequest req(mSafeJSContext); JSAutoRequest req(mSafeJSContext);
ContextOptionsRef(mSafeJSContext).setNoDefaultCompartmentObject(true);
JS_SetErrorReporter(mSafeJSContext, xpc::SystemErrorReporter); JS_SetErrorReporter(mSafeJSContext, xpc::SystemErrorReporter);
@ -187,10 +188,6 @@ XPCJSContextStack::InitSafeJSContext()
MOZ_CRASH(); MOZ_CRASH();
JS_AddNamedObjectRoot(mSafeJSContext, &mSafeJSContextGlobal, "SafeJSContext global"); JS_AddNamedObjectRoot(mSafeJSContext, &mSafeJSContextGlobal, "SafeJSContext global");
// Make sure the context is associated with a proper compartment
// and not the default compartment.
js::SetDefaultObjectForContext(mSafeJSContext, mSafeJSContextGlobal);
// Note: make sure to set the private before calling // Note: make sure to set the private before calling
// InitClasses // InitClasses
nsRefPtr<SandboxPrivate> sp = new SandboxPrivate(principal, mSafeJSContextGlobal); nsRefPtr<SandboxPrivate> sp = new SandboxPrivate(principal, mSafeJSContextGlobal);

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

@ -228,6 +228,7 @@ ThreadsafeAutoJSContext::operator JSContext*() const
AutoSafeJSContext::AutoSafeJSContext(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL) AutoSafeJSContext::AutoSafeJSContext(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL)
: AutoJSContext(true MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT) : AutoJSContext(true MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT)
, mAc(mCx, XPCJSRuntime::Get()->GetJSContextStack()->GetSafeJSContextGlobal())
{ {
} }

3
js/xpconnect/src/nsCxPusher.h
View File

@ -100,7 +100,6 @@ public:
protected: protected:
AutoJSContext(bool aSafe MOZ_GUARD_OBJECT_NOTIFIER_PARAM); AutoJSContext(bool aSafe MOZ_GUARD_OBJECT_NOTIFIER_PARAM);
private:
// We need this Init() method because we can't use delegating constructor for // We need this Init() method because we can't use delegating constructor for
// the moment. It is a C++11 feature and we do not require C++11 to be // the moment. It is a C++11 feature and we do not require C++11 to be
// supported to be able to compile Gecko. // supported to be able to compile Gecko.
@ -134,6 +133,8 @@ private:
class MOZ_STACK_CLASS AutoSafeJSContext : public AutoJSContext { class MOZ_STACK_CLASS AutoSafeJSContext : public AutoJSContext {
public: public:
AutoSafeJSContext(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM); AutoSafeJSContext(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM);
private:
JSAutoCompartment mAc;
}; };
/** /**