aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/proxyhandler.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-01-25 21:23:12 +0100
committerMs2ger <ms2ger@gmail.com>2015-01-25 21:42:07 +0100
commit46e4ac280fe13d7b1234e9e462a2db4ed47e2851 (patch)
treec15344d9b617e5ec4787d30f19c8e307f7aabf25 /components/script/dom/bindings/proxyhandler.rs
parent5f5381e4c18da10cfb39f4c793b306be6192cc0e (diff)
downloadservo-46e4ac280fe13d7b1234e9e462a2db4ed47e2851.tar.gz
servo-46e4ac280fe13d7b1234e9e462a2db4ed47e2851.zip
Panic if JS_NewObjectWithGivenProto fails.
Diffstat (limited to 'components/script/dom/bindings/proxyhandler.rs')
-rw-r--r--components/script/dom/bindings/proxyhandler.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs
index 49dbbf867d7..0fbfc1700a0 100644
--- a/components/script/dom/bindings/proxyhandler.rs
+++ b/components/script/dom/bindings/proxyhandler.rs
@@ -63,10 +63,6 @@ pub unsafe extern fn defineProperty_(cx: *mut JSContext, proxy: *mut JSObject, i
}
let expando = EnsureExpandoObject(cx, proxy);
- if expando.is_null() {
- return false;
- }
-
return JS_DefinePropertyById(cx, expando, id, (*desc).value, (*desc).getter,
(*desc).setter, (*desc).attrs) != 0;
}
@@ -115,9 +111,7 @@ pub fn EnsureExpandoObject(cx: *mut JSContext, obj: *mut JSObject) -> *mut JSObj
expando = JS_NewObjectWithGivenProto(cx, ptr::null_mut(),
ptr::null_mut(),
GetObjectParent(obj));
- if expando.is_null() {
- return ptr::null_mut();
- }
+ assert!(!expando.is_null());
SetProxyExtra(obj, JSPROXYSLOT_EXPANDO, ObjectValue(&*expando));
}