From 23d9a5af4b01b5d6aeaddc93b00a66f7af02a982 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 4 Mar 2014 22:49:25 +0100 Subject: [PATCH] Fail if JS_NewUCStringCopyN returns null in str_to_jsval. --- src/components/script/dom/bindings/utils.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index b1787f1f071..1ce06bb78e9 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -211,11 +211,9 @@ pub unsafe fn str_to_jsval(cx: *JSContext, string: DOMString) -> JSVal { let string_utf16 = string.to_utf16(); let jsstr = JS_NewUCStringCopyN(cx, string_utf16.as_ptr(), string_utf16.len() as libc::size_t); if jsstr.is_null() { - // FIXME: is there something else we should do on failure? - JSVAL_NULL - } else { - RUST_STRING_TO_JSVAL(jsstr) + fail!("JS_NewUCStringCopyN failed"); } + RUST_STRING_TO_JSVAL(jsstr) } pub unsafe fn domstring_to_jsval(cx: *JSContext, string: Option) -> JSVal {