Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1042680 - Allow add-ons to assign to var-declared chrome global with compartment_per_addon (r=bholley)

Browse Source
This commit is contained in:
Bill McCloskey 2014-09-10 17:15:40 -07:00
parent 53036348cb
commit a38518d345
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/xpconnect/src/Sandbox.cpp
View File

@ -406,10 +406,31 @@ sandbox_addProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleV
// After bug 1015790 is fixed, we should be able to remove this unwrapping.
RootedObject unwrappedProto(cx, js::UncheckedUnwrap(proto, /* stopAtOuter = */ false));
if (!JS_CopyPropertyFrom(cx, id, unwrappedProto, obj))
Rooted<JSPropertyDescriptor> pd(cx);
if (!JS_GetPropertyDescriptorById(cx, proto, id, &pd))
return false;
Rooted<JSPropertyDescriptor> pd(cx);
// This is a little icky. If the property exists and is not configurable,
// then JS_CopyPropertyFrom will throw an exception when we try to do a
// normal assignment since it will think we're trying to remove the
// non-configurability. So we do JS_SetPropertyById in that case.
//
// However, in the case of |const x = 3|, we get called once for
// JSOP_DEFCONST and once for JSOP_SETCONST. The first one creates the
// property as readonly and configurable. The second one changes the
// attributes to readonly and not configurable. If we use JS_SetPropertyById
// for the second call, it will throw an exception because the property is
// readonly. We have to use JS_CopyPropertyFrom since it ignores the
// readonly attribute (as it calls JSObject::defineProperty). See bug
// 1019181.
if (pd.object() && pd.isPermanent()) {
if (!JS_SetPropertyById(cx, proto, id, vp))
return false;
} else {
if (!JS_CopyPropertyFrom(cx, id, unwrappedProto, obj))
return false;
}
if (!JS_GetPropertyDescriptorById(cx, obj, id, &pd))
return false;
unsigned attrs = pd.attributes() & ~(JSPROP_GETTER | JSPROP_SETTER);

6
js/xpconnect/tests/unit/test_writeToGlobalPrototype.js
View File

@ -1,4 +1,4 @@
const A = 3;
var G = 3;
const Cu = Components.utils;
@ -36,6 +36,10 @@ function run_test()
Cu.evalInSandbox("q = 12", s);
do_check_eq(q, 12);
do_check_eq(Cu.evalInSandbox("G", s), 3);
Cu.evalInSandbox("G = 12", s);
do_check_eq(G, 12);
Cu.evalInSandbox("Object.defineProperty(this, 'x', {enumerable: false, value: 3})", s);
do_check_eq(Cu.evalInSandbox("x", s), 3);
do_check_eq(x, 3);