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

Throw a TypeError when get_callable_property encounters a value that isn't callable.

Browse source
This commit is contained in:
Ms2ger 2015-06-14 16:45:28 +02:00
parent 0607cd3fb5
commit 90a7ef1571
3 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,16 +99,15 @@ impl CallbackInterface {
-> Fallible<JSVal> {
let mut callable = UndefinedValue();
unsafe {
let name = CString::new(name).unwrap();
if JS_GetProperty(cx, self.callback(), name.as_ptr(), &mut callable) == 0 {
let c_name = CString::new(name).unwrap();
if JS_GetProperty(cx, self.callback(), c_name.as_ptr(), &mut callable) == 0 {
return Err(Error::JSFailed);
}
if !callable.is_object() ||
JS_ObjectIsCallable(cx, callable.to_object()) == 0 {
// FIXME(#347)
//ThrowErrorMessage(cx, MSG_NOT_CALLABLE, description.get());
return Err(Error::JSFailed);
return Err(Error::Type(
format!("The value of the {} property is not callable", name)));
}
}
Ok(callable)