RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:27:35 +00:00
Code Issues Activity Actions

LibWeb: Let various functions throw if not enough arguments

Browse source 
...instead of handing out null / undefined / empty values.
This commit is contained in:
Linus Groh 2020-05-21 00:55:01 +01:00 • committed by Andreas Kling
parent 2d503b20da
commit e3e9749d88
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibWeb/Bindings/DocumentWrapper.cpp
View file

@ -76,7 +76,7 @@ JS::Value DocumentWrapper::get_element_by_id(JS::Interpreter& interpreter)
if (!document) if (!document)
return {}; return {};
if (!interpreter.argument_count()) if (!interpreter.argument_count())
return JS::js_null(); return interpreter.throw_exception<JS::TypeError>("getElementById() needs one argument");
auto id = interpreter.argument(0).to_string(interpreter); auto id = interpreter.argument(0).to_string(interpreter);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
@ -92,7 +92,7 @@ JS::Value DocumentWrapper::query_selector_all(JS::Interpreter& interpreter)
if (!document) if (!document)
return {}; return {};
if (!interpreter.argument_count()) if (!interpreter.argument_count())
return JS::js_null(); return interpreter.throw_exception<JS::TypeError>("querySelectorAll() needs one argument");
auto selector = interpreter.argument(0).to_string(interpreter); auto selector = interpreter.argument(0).to_string(interpreter);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};

3
Libraries/LibWeb/Bindings/EventTargetWrapper.cpp
View file

@ -27,6 +27,7 @@
#include <AK/FlyString.h> #include <AK/FlyString.h>
#include <AK/Function.h> #include <AK/Function.h>
#include <LibJS/Interpreter.h> #include <LibJS/Interpreter.h>
#include <LibJS/Runtime/Error.h>
#include <LibJS/Runtime/Function.h> #include <LibJS/Runtime/Function.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
#include <LibWeb/Bindings/EventListenerWrapper.h> #include <LibWeb/Bindings/EventListenerWrapper.h>
@ -54,7 +55,7 @@ JS::Value EventTargetWrapper::add_event_listener(JS::Interpreter& interpreter)
if (!this_object) if (!this_object)
return {}; return {};
if (interpreter.argument_count() < 2) if (interpreter.argument_count() < 2)
return JS::js_undefined(); return interpreter.throw_exception<JS::TypeError>("addEventListener() needs two arguments");
auto event_name = interpreter.argument(0).to_string(interpreter); auto event_name = interpreter.argument(0).to_string(interpreter);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};

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

@ -128,8 +128,8 @@ JS::Value WindowObject::set_interval(JS::Interpreter& interpreter)
auto* impl = impl_from(interpreter); auto* impl = impl_from(interpreter);
if (!impl) if (!impl)
return {}; return {};
if (interpreter.argument_count() < 2) if (!interpreter.argument_count())
return {}; return interpreter.throw_exception<JS::TypeError>("setInterval() needs at least one argument");
auto* callback_object = interpreter.argument(0).to_object(interpreter); auto* callback_object = interpreter.argument(0).to_object(interpreter);
if (!callback_object) if (!callback_object)
return {}; return {};
@ -148,7 +148,7 @@ JS::Value WindowObject::set_timeout(JS::Interpreter& interpreter)
if (!impl) if (!impl)
return {}; return {};
if (!interpreter.argument_count()) if (!interpreter.argument_count())
return {}; return interpreter.throw_exception<JS::TypeError>("setTimeout() needs at least one argument");
auto* callback_object = interpreter.argument(0).to_object(interpreter); auto* callback_object = interpreter.argument(0).to_object(interpreter);
if (!callback_object) if (!callback_object)
return {}; return {};
@ -172,7 +172,7 @@ JS::Value WindowObject::request_animation_frame(JS::Interpreter& interpreter)
if (!impl) if (!impl)
return {}; return {};
if (!interpreter.argument_count()) if (!interpreter.argument_count())
return {}; return interpreter.throw_exception<JS::TypeError>("requestAnimationFrame() needs one argument");
auto* callback_object = interpreter.argument(0).to_object(interpreter); auto* callback_object = interpreter.argument(0).to_object(interpreter);
if (!callback_object) if (!callback_object)
return {}; return {};
@ -187,7 +187,7 @@ JS::Value WindowObject::cancel_animation_frame(JS::Interpreter& interpreter)
if (!impl) if (!impl)
return {}; return {};
if (!interpreter.argument_count()) if (!interpreter.argument_count())
return {}; return interpreter.throw_exception<JS::TypeError>("cancelAnimationFrame() needs one argument");
auto id = interpreter.argument(0).to_i32(interpreter); auto id = interpreter.argument(0).to_i32(interpreter);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};