Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use safe JSContext in callbacks

Browse source
This commit is contained in:
marmeladema 2019-07-27 20:03:16 +01:00
parent 0703a1ad6d
commit 357b6c54ff
2 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

46
components/script/dom/bindings/callback.rs
View file

@ -13,10 +13,10 @@ use crate::dom::bindings::settings_stack::{AutoEntryScript, AutoIncumbentScript}
use crate::dom::bindings::utils::AsCCharPtrPtr; use crate::dom::bindings::utils::AsCCharPtrPtr;
use crate::dom::globalscope::GlobalScope; use crate::dom::globalscope::GlobalScope;
use crate::dom::window::Window; use crate::dom::window::Window;
use crate::script_runtime::JSContext as SafeJSContext; use crate::script_runtime::JSContext;
use js::jsapi::Heap; use js::jsapi::Heap;
use js::jsapi::JSAutoRealm; use js::jsapi::JSAutoRealm;
use js::jsapi::{AddRawValueRoot, IsCallable, JSContext, JSObject}; use js::jsapi::{AddRawValueRoot, IsCallable, JSObject};
use js::jsapi::{EnterRealm, LeaveRealm, Realm, RemoveRawValueRoot}; use js::jsapi::{EnterRealm, LeaveRealm, Realm, RemoveRawValueRoot};
use js::jsval::{JSVal, ObjectValue, UndefinedValue}; use js::jsval::{JSVal, ObjectValue, UndefinedValue};
use js::rust::wrappers::{JS_GetProperty, JS_WrapObject}; use js::rust::wrappers::{JS_GetProperty, JS_WrapObject};
@ -82,11 +82,11 @@ impl CallbackObject {
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn init(&mut self, cx: *mut JSContext, callback: *mut JSObject) { unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
self.callback.set(callback); self.callback.set(callback);
self.permanent_js_root.set(ObjectValue(callback)); self.permanent_js_root.set(ObjectValue(callback));
assert!(AddRawValueRoot( assert!(AddRawValueRoot(
cx, *cx,
self.permanent_js_root.get_unsafe(), self.permanent_js_root.get_unsafe(),
b"CallbackObject::root\n".as_c_char_ptr() b"CallbackObject::root\n".as_c_char_ptr()
)); ));
@ -113,7 +113,7 @@ impl PartialEq for CallbackObject {
/// callback interface types. /// callback interface types.
pub trait CallbackContainer { pub trait CallbackContainer {
/// Create a new CallbackContainer object for the given `JSObject`. /// Create a new CallbackContainer object for the given `JSObject`.
unsafe fn new(cx: SafeJSContext, callback: *mut JSObject) -> Rc<Self>; unsafe fn new(cx: JSContext, callback: *mut JSObject) -> Rc<Self>;
/// Returns the underlying `CallbackObject`. /// Returns the underlying `CallbackObject`.
fn callback_holder(&self) -> &CallbackObject; fn callback_holder(&self) -> &CallbackObject;
/// Returns the underlying `JSObject`. /// Returns the underlying `JSObject`.
@ -152,8 +152,8 @@ impl CallbackFunction {
/// Initialize the callback function with a value. /// Initialize the callback function with a value.
/// Should be called once this object is done moving. /// Should be called once this object is done moving.
pub unsafe fn init(&mut self, cx: SafeJSContext, callback: *mut JSObject) { pub unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
self.object.init(*cx, callback); self.object.init(cx, callback);
} }
} }
@ -179,18 +179,18 @@ impl CallbackInterface {
/// Initialize the callback function with a value. /// Initialize the callback function with a value.
/// Should be called once this object is done moving. /// Should be called once this object is done moving.
pub unsafe fn init(&mut self, cx: SafeJSContext, callback: *mut JSObject) { pub unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
self.object.init(*cx, callback); self.object.init(cx, callback);
} }
/// Returns the property with the given `name`, if it is a callable object, /// Returns the property with the given `name`, if it is a callable object,
/// or an error otherwise. /// or an error otherwise.
pub fn get_callable_property(&self, cx: *mut JSContext, name: &str) -> Fallible<JSVal> { pub fn get_callable_property(&self, cx: JSContext, name: &str) -> Fallible<JSVal> {
rooted!(in(cx) let mut callable = UndefinedValue()); rooted!(in(*cx) let mut callable = UndefinedValue());
rooted!(in(cx) let obj = self.callback_holder().get()); rooted!(in(*cx) let obj = self.callback_holder().get());
unsafe { unsafe {
let c_name = CString::new(name).unwrap(); let c_name = CString::new(name).unwrap();
if !JS_GetProperty(cx, obj.handle(), c_name.as_ptr(), callable.handle_mut()) { if !JS_GetProperty(*cx, obj.handle(), c_name.as_ptr(), callable.handle_mut()) {
return Err(Error::JSFailed); return Err(Error::JSFailed);
} }
@ -206,16 +206,12 @@ impl CallbackInterface {
} }
/// Wraps the reflector for `p` into the compartment of `cx`. /// Wraps the reflector for `p` into the compartment of `cx`.
pub fn wrap_call_this_object<T: DomObject>( pub fn wrap_call_this_object<T: DomObject>(cx: JSContext, p: &T, mut rval: MutableHandleObject) {
cx: *mut JSContext,
p: &T,
mut rval: MutableHandleObject,
) {
rval.set(p.reflector().get_jsobject().get()); rval.set(p.reflector().get_jsobject().get());
assert!(!rval.get().is_null()); assert!(!rval.get().is_null());
unsafe { unsafe {
if !JS_WrapObject(cx, rval) { if !JS_WrapObject(*cx, rval) {
rval.set(ptr::null_mut()); rval.set(ptr::null_mut());
} }
} }
@ -228,7 +224,7 @@ pub struct CallSetup {
/// (possibly wrapped) callback object. /// (possibly wrapped) callback object.
exception_global: DomRoot<GlobalScope>, exception_global: DomRoot<GlobalScope>,
/// The `JSContext` used for the call. /// The `JSContext` used for the call.
cx: *mut JSContext, cx: JSContext,
/// The compartment we were in before the call. /// The compartment we were in before the call.
old_realm: *mut Realm, old_realm: *mut Realm,
/// The exception handling used for the call. /// The exception handling used for the call.
@ -255,7 +251,7 @@ impl CallSetup {
let ais = callback.incumbent().map(AutoIncumbentScript::new); let ais = callback.incumbent().map(AutoIncumbentScript::new);
CallSetup { CallSetup {
exception_global: global, exception_global: global,
cx: *cx, cx: cx,
old_realm: unsafe { EnterRealm(*cx, callback.callback()) }, old_realm: unsafe { EnterRealm(*cx, callback.callback()) },
handling: handling, handling: handling,
entry_script: Some(aes), entry_script: Some(aes),
@ -264,7 +260,7 @@ impl CallSetup {
} }
/// Returns the `JSContext` used for the call. /// Returns the `JSContext` used for the call.
pub fn get_context(&self) -> *mut JSContext { pub fn get_context(&self) -> JSContext {
self.cx self.cx
} }
} }
@ -272,13 +268,13 @@ impl CallSetup {
impl Drop for CallSetup { impl Drop for CallSetup {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
LeaveRealm(self.cx, self.old_realm); LeaveRealm(*self.cx, self.old_realm);
if self.handling == ExceptionHandling::Report { if self.handling == ExceptionHandling::Report {
let _ac = JSAutoRealm::new( let _ac = JSAutoRealm::new(
self.cx, *self.cx,
self.exception_global.reflector().get_jsobject().get(), self.exception_global.reflector().get_jsobject().get(),
); );
report_pending_exception(self.cx, true); report_pending_exception(*self.cx, true);
} }
drop(self.incumbent_script.take()); drop(self.incumbent_script.take());
drop(self.entry_script.take().unwrap()); drop(self.entry_script.take().unwrap());

12
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -6828,8 +6828,8 @@ class CGCallback(CGClass):
# Record the names of all the arguments, so we can use them when we call # Record the names of all the arguments, so we can use them when we call
# the private method. # the private method.
argnames = [arg.name for arg in args] argnames = [arg.name for arg in args]
argnamesWithThis = ["SafeJSContext::from_ptr(s.get_context())", "thisObjJS.handle()"] + argnames argnamesWithThis = ["s.get_context()", "thisObjJS.handle()"] + argnames
argnamesWithoutThis = ["SafeJSContext::from_ptr(s.get_context())", "thisObjJS.handle()"] + argnames argnamesWithoutThis = ["s.get_context()", "thisObjJS.handle()"] + argnames
# Now that we've recorded the argnames for our call to our private # Now that we've recorded the argnames for our call to our private
# method, insert our optional argument for deciding whether the # method, insert our optional argument for deciding whether the
# CallSetup should re-throw exceptions on aRv. # CallSetup should re-throw exceptions on aRv.
@ -6849,7 +6849,7 @@ class CGCallback(CGClass):
bodyWithThis = string.Template( bodyWithThis = string.Template(
setupCall + setupCall +
"rooted!(in(s.get_context()) let mut thisObjJS = ptr::null_mut::<JSObject>());\n" "rooted!(in(*s.get_context()) let mut thisObjJS = ptr::null_mut::<JSObject>());\n"
"wrap_call_this_object(s.get_context(), thisObj, thisObjJS.handle_mut());\n" "wrap_call_this_object(s.get_context(), thisObj, thisObjJS.handle_mut());\n"
"if thisObjJS.is_null() {\n" "if thisObjJS.is_null() {\n"
" return Err(JSFailed);\n" " return Err(JSFailed);\n"
@ -6860,7 +6860,7 @@ class CGCallback(CGClass):
}) })
bodyWithoutThis = string.Template( bodyWithoutThis = string.Template(
setupCall + setupCall +
"rooted!(in(s.get_context()) let thisObjJS = ptr::null_mut::<JSObject>());\n" "rooted!(in(*s.get_context()) let thisObjJS = ptr::null_mut::<JSObject>());\n"
"unsafe { ${methodName}(${callArgs}) }").substitute({ "unsafe { ${methodName}(${callArgs}) }").substitute({
"callArgs": ", ".join(argnamesWithoutThis), "callArgs": ", ".join(argnamesWithoutThis),
"methodName": 'self.' + method.name, "methodName": 'self.' + method.name,
@ -7118,7 +7118,7 @@ class CallbackMember(CGNativeMember):
return "" return ""
return ( return (
"CallSetup s(CallbackPreserveColor(), aRv, aExceptionHandling);\n" "CallSetup s(CallbackPreserveColor(), aRv, aExceptionHandling);\n"
"JSContext* cx = s.get_context();\n" "JSContext* cx = *s.get_context();\n"
"if (!cx) {\n" "if (!cx) {\n"
" return Err(JSFailed);\n" " return Err(JSFailed);\n"
"}\n") "}\n")
@ -7219,7 +7219,7 @@ class CallbackOperationBase(CallbackMethod):
"methodName": self.methodName "methodName": self.methodName
} }
getCallableFromProp = string.Template( getCallableFromProp = string.Template(
'r#try!(self.parent.get_callable_property(*cx, "${methodName}"))' 'r#try!(self.parent.get_callable_property(cx, "${methodName}"))'
).substitute(replacements) ).substitute(replacements)
if not self.singleOperation: if not self.singleOperation:
return 'rooted!(in(*cx) let callable =\n' + getCallableFromProp + ');\n' return 'rooted!(in(*cx) let callable =\n' + getCallableFromProp + ');\n'