RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:48:11 +00:00
Code Issues Activity Actions

LibJS: Pass Interpreter& to Value::to_number() et al.

Browse source 
This patch is unfortunately rather large and might make some things feel
bloated, but it is necessary to fix a few flaws in LibJS, primarily
blindly coercing values to numbers without exception checks - i.e.

interpreter.argument(0).to_i32();  // can fail!!!

Some examples where the interpreter would actually crash:

var o = { toString: () => { throw Error() } };
+o;
o - 1;
"foo".charAt(o);
"bar".repeat(o);

To fix this, we now have the following...

to_double(Interpreter&)
to_i32()
to_i32(Interpreter&)
to_size_t()
to_size_t(Interpreter&)

...and a whole lot of exception checking.

There's intentionally no to_double(), use as_double() directly instead.

This way we still can use these convenient utility functions but don't
need to check for exceptions if we are sure the value already is a
number.

Fixes #2267.
This commit is contained in:
Linus Groh 2020-05-18 00:28:00 +01:00 • committed by Andreas Kling
parent 1a1394f7a2
commit 476094922b
17 changed files with 491 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Libraries/LibWeb/Bindings/WindowObject.cpp
View file

@ -134,7 +134,10 @@ JS::Value WindowObject::set_interval(JS::Interpreter& interpreter)
return {};
if (!callback_object->is_function())
return interpreter.throw_exception<JS::TypeError>("Not a function");
impl->set_interval(*static_cast<JS::Function*>(callback_object), arguments[1].to_i32());
auto interval = arguments[1].to_i32(interpreter);
if (interpreter.exception())
return {};
impl->set_interval(*static_cast<JS::Function*>(callback_object), interval);
return JS::js_undefined();
}
@ -153,8 +156,11 @@ JS::Value WindowObject::set_timeout(JS::Interpreter& interpreter)
return interpreter.throw_exception<JS::TypeError>("Not a function");
i32 interval = 0;
if (interpreter.argument_count() >= 2)
interval = arguments[1].to_i32();
if (interpreter.argument_count() >= 2) {
interval = arguments[1].to_i32(interpreter);
if (interpreter.exception())
return {};
}
impl->set_timeout(*static_cast<JS::Function*>(callback_object), interval);
return JS::js_undefined();
@ -184,7 +190,10 @@ JS::Value WindowObject::cancel_animation_frame(JS::Interpreter& interpreter)
auto& arguments = interpreter.call_frame().arguments;
if (arguments.size() < 1)
return {};
impl->cancel_animation_frame(arguments[0].to_i32());
auto id = arguments[0].to_i32(interpreter);
if (interpreter.exception())
return {};
impl->cancel_animation_frame(id);
return JS::js_undefined();
}