diff options
| -rw-r--r-- | components/script/dom/customelementregistry.rs | 11 | ||||
| -rw-r--r-- | tests/wpt/metadata/custom-elements/custom-element-registry/define.html.ini | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs index a625d464129..e3f90217c01 100644 --- a/components/script/dom/customelementregistry.rs +++ b/components/script/dom/customelementregistry.rs @@ -27,6 +27,7 @@ use dom::window::Window; use dom_struct::dom_struct; use html5ever::{LocalName, Namespace, Prefix}; use js::conversions::ToJSValConvertible; +use js::glue::UnwrapObject; use js::jsapi::{Construct1, IsCallable, IsConstructor, HandleValueArray, HandleObject, MutableHandleValue}; use js::jsapi::{Heap, JS_GetProperty, JS_SameValue, JSAutoCompartment, JSContext}; use js::jsval::{JSVal, NullValue, ObjectValue, UndefinedValue}; @@ -194,7 +195,15 @@ impl CustomElementRegistryMethods for CustomElementRegistry { let name = LocalName::from(&*name); // Step 1 - if unsafe { !IsConstructor(constructor.get()) } { + // We must unwrap the constructor as all wrappers are constructable if they are callable. + rooted!(in(cx) let unwrapped_constructor = unsafe { UnwrapObject(constructor.get(), 1) }); + + if unwrapped_constructor.is_null() { + // We do not have permission to access the unwrapped constructor. + return Err(Error::Security); + } + + if unsafe { !IsConstructor(unwrapped_constructor.get()) } { return Err(Error::Type("Second argument of CustomElementRegistry.define is not a constructor".to_owned())); } diff --git a/tests/wpt/metadata/custom-elements/custom-element-registry/define.html.ini b/tests/wpt/metadata/custom-elements/custom-element-registry/define.html.ini deleted file mode 100644 index 14558fa24b2..00000000000 --- a/tests/wpt/metadata/custom-elements/custom-element-registry/define.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[define.html] - type: testharness - [If constructor is arrow function, should throw a TypeError] - expected: FAIL - |