Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use safe JSContext as first argument for throw_dom_exception
  • Loading branch information
marmeladema committed Aug 8, 2019
1 parent 6c26518 commit 0703a1a
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 25 deletions.
10 changes: 5 additions & 5 deletions components/script/dom/bindings/codegen/CodegenRust.py
Expand Up @@ -813,7 +813,7 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
match Promise::new_resolved(&promiseGlobal, cx, valueToResolve.handle()) {
Ok(value) => value,
Err(error) => {
throw_dom_exception(*cx, &promiseGlobal, error);
throw_dom_exception(cx, &promiseGlobal, error);
$*{exceptionCode}
}
}
Expand Down Expand Up @@ -3372,7 +3372,7 @@ def __init__(self, errorResult, arguments, argsPre, returnType,
"let result = match result {\n"
" Ok(result) => result,\n"
" Err(e) => {\n"
" throw_dom_exception(*cx, %s, e);\n"
" throw_dom_exception(cx, %s, e);\n"
" return%s;\n"
" },\n"
"};" % (glob, errorResult)))
Expand Down Expand Up @@ -5556,12 +5556,12 @@ def definition_body(self):
// so we can do the spec's object-identity checks.
rooted!(in(*cx) let new_target = UnwrapObjectDynamic(args.new_target().to_object(), *cx, 1));
if new_target.is_null() {
throw_dom_exception(*cx, global.upcast::<GlobalScope>(), Error::Type("new.target is null".to_owned()));
throw_dom_exception(cx, global.upcast::<GlobalScope>(), Error::Type("new.target is null".to_owned()));
return false;
}
if args.callee() == new_target.get() {
throw_dom_exception(*cx, global.upcast::<GlobalScope>(),
throw_dom_exception(cx, global.upcast::<GlobalScope>(),
Error::Type("new.target must not be the active function object".to_owned()));
return false;
}
Expand Down Expand Up @@ -5602,7 +5602,7 @@ def definition_body(self):
let result = match result {
Ok(result) => result,
Err(e) => {
throw_dom_exception(*cx, global.upcast::<GlobalScope>(), e);
throw_dom_exception(cx, global.upcast::<GlobalScope>(), e);
return false;
},
};
Expand Down
35 changes: 19 additions & 16 deletions components/script/dom/bindings/error.rs
Expand Up @@ -15,6 +15,7 @@ use crate::dom::bindings::conversions::{
use crate::dom::bindings::str::USVString;
use crate::dom::domexception::{DOMErrorName, DOMException};
use crate::dom::globalscope::GlobalScope;
use crate::script_runtime::JSContext as SafeJSContext;
#[cfg(feature = "js_backtrace")]
use backtrace::Backtrace;
use js::error::{throw_range_error, throw_type_error};
Expand Down Expand Up @@ -104,10 +105,10 @@ pub type Fallible<T> = Result<T, Error>;
pub type ErrorResult = Fallible<()>;

/// Set a pending exception for the given `result` on `cx`.
pub unsafe fn throw_dom_exception(cx: *mut JSContext, global: &GlobalScope, result: Error) {
pub fn throw_dom_exception(cx: SafeJSContext, global: &GlobalScope, result: Error) {
#[cfg(feature = "js_backtrace")]
{
capture_stack!(in(cx) let stack);
capture_stack!(in(*cx) let stack);
let js_stack = stack.and_then(|s| s.as_string(None));
let rust_stack = Backtrace::new();
LAST_EXCEPTION_BACKTRACE.with(|backtrace| {
Expand Down Expand Up @@ -139,27 +140,29 @@ pub unsafe fn throw_dom_exception(cx: *mut JSContext, global: &GlobalScope, resu
Error::InvalidModification => DOMErrorName::InvalidModificationError,
Error::NotReadable => DOMErrorName::NotReadableError,
Error::Operation => DOMErrorName::OperationError,
Error::Type(message) => {
assert!(!JS_IsExceptionPending(cx));
throw_type_error(cx, &message);
Error::Type(message) => unsafe {
assert!(!JS_IsExceptionPending(*cx));
throw_type_error(*cx, &message);
return;
},
Error::Range(message) => {
assert!(!JS_IsExceptionPending(cx));
throw_range_error(cx, &message);
Error::Range(message) => unsafe {
assert!(!JS_IsExceptionPending(*cx));
throw_range_error(*cx, &message);
return;
},
Error::JSFailed => {
assert!(JS_IsExceptionPending(cx));
Error::JSFailed => unsafe {
assert!(JS_IsExceptionPending(*cx));
return;
},
};

assert!(!JS_IsExceptionPending(cx));
let exception = DOMException::new(global, code);
rooted!(in(cx) let mut thrown = UndefinedValue());
exception.to_jsval(cx, thrown.handle_mut());
JS_SetPendingException(cx, thrown.handle());
unsafe {
assert!(!JS_IsExceptionPending(*cx));
let exception = DOMException::new(global, code);
rooted!(in(*cx) let mut thrown = UndefinedValue());
exception.to_jsval(*cx, thrown.handle_mut());
JS_SetPendingException(*cx, thrown.handle());
}
}

/// A struct encapsulating information about a runtime script error.
Expand Down Expand Up @@ -310,7 +313,7 @@ impl Error {
Error::JSFailed => (),
_ => assert!(!JS_IsExceptionPending(cx)),
}
throw_dom_exception(cx, global, self);
throw_dom_exception(SafeJSContext::from_ptr(cx), global, self);
assert!(JS_IsExceptionPending(cx));
assert!(JS_GetPendingException(cx, rval));
JS_ClearPendingException(cx);
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/create.rs
Expand Up @@ -158,7 +158,7 @@ fn create_html_element(
unsafe {
let _ac =
JSAutoRealm::new(*cx, global.reflector().get_jsobject().get());
throw_dom_exception(*cx, &global, error);
throw_dom_exception(cx, &global, error);
report_pending_exception(*cx, true);
}

Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/customelementregistry.rs
Expand Up @@ -625,7 +625,7 @@ pub fn upgrade_element(definition: Rc<CustomElementDefinition>, element: &Elemen
let global = GlobalScope::current().expect("No current global");
let cx = global.get_cx();
unsafe {
throw_dom_exception(*cx, &global, error);
throw_dom_exception(cx, &global, error);
report_pending_exception(*cx, true);
}
return;
Expand Down
3 changes: 2 additions & 1 deletion components/script/dom/windowproxy.rs
Expand Up @@ -18,6 +18,7 @@ use crate::dom::document::Document;
use crate::dom::element::Element;
use crate::dom::globalscope::GlobalScope;
use crate::dom::window::Window;
use crate::script_runtime::JSContext as SafeJSContext;
use crate::script_thread::ScriptThread;
use dom_struct::dom_struct;
use embedder_traits::EmbedderMsg;
Expand Down Expand Up @@ -959,7 +960,7 @@ pub fn new_window_proxy_handler() -> WindowProxyHandler {
unsafe fn throw_security_error(cx: *mut JSContext) -> bool {
if !JS_IsExceptionPending(cx) {
let global = GlobalScope::from_context(cx);
throw_dom_exception(cx, &*global, Error::Security);
throw_dom_exception(SafeJSContext::from_ptr(cx), &*global, Error::Security);
}
false
}
Expand Down
2 changes: 1 addition & 1 deletion components/script/webdriver_handlers.rs
Expand Up @@ -739,7 +739,7 @@ pub fn handle_get_property(
Err(_) => Ok(WebDriverJSValue::Undefined),
},
Err(error) => {
unsafe { throw_dom_exception(*cx, &node.reflector().global(), error) };
throw_dom_exception(cx, &node.reflector().global(), error);
Ok(WebDriverJSValue::Undefined)
},
}
Expand Down

0 comments on commit 0703a1a

Please sign in to comment.