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

LibJS: Add missing exception check in Date() constructor

Browse source
This commit is contained in:
Linus Groh 2021-02-13 12:35:31 +01:00 • committed by Andreas Kling
parent ddbd88d5c6
commit db340ae7aa
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibJS/Runtime/DateConstructor.cpp
View file

@ -168,29 +168,33 @@ Value DateConstructor::call()
Value DateConstructor::construct(Function&) Value DateConstructor::construct(Function&)
{ {
if (vm().argument_count() == 0) { auto& vm = this->vm();
if (vm.argument_count() == 0) {
struct timeval tv; struct timeval tv;
gettimeofday(&tv, nullptr); gettimeofday(&tv, nullptr);
auto datetime = Core::DateTime::now(); auto datetime = Core::DateTime::now();
auto milliseconds = static_cast<u16>(tv.tv_usec / 1000); auto milliseconds = static_cast<u16>(tv.tv_usec / 1000);
return Date::create(global_object(), datetime, milliseconds); return Date::create(global_object(), datetime, milliseconds);
} }
if (vm().argument_count() == 1) { if (vm.argument_count() == 1) {
auto value = vm().argument(0); auto value = vm.argument(0);
if (value.is_string()) if (value.is_string())
value = parse_simplified_iso8601(value.as_string().string()); value = parse_simplified_iso8601(value.as_string().string());
// A timestamp since the epoch, in UTC. // A timestamp since the epoch, in UTC.
// FIXME: This doesn't construct an "Invalid Date" object if the argument is NaN.
// FIXME: Date() probably should use a double as internal representation, so that NaN arguments and larger offsets are handled correctly. // FIXME: Date() probably should use a double as internal representation, so that NaN arguments and larger offsets are handled correctly.
double value_as_double = value.to_double(global_object()); double value_as_double = value.to_double(global_object());
if (vm.exception())
return {};
auto datetime = Core::DateTime::from_timestamp(static_cast<time_t>(value_as_double / 1000)); auto datetime = Core::DateTime::from_timestamp(static_cast<time_t>(value_as_double / 1000));
auto milliseconds = static_cast<u16>(fmod(value_as_double, 1000)); auto milliseconds = static_cast<u16>(fmod(value_as_double, 1000));
return Date::create(global_object(), datetime, milliseconds); return Date::create(global_object(), datetime, milliseconds);
} }
// A date/time in components, in local time. // A date/time in components, in local time.
// FIXME: This doesn't construct an "Invalid Date" object if one of the parameters is NaN. // FIXME: This doesn't construct an "Invalid Date" object if one of the arguments is NaN.
auto arg_or = [this](size_t i, i32 fallback) { return vm().argument_count() > i ? vm().argument(i).to_i32(global_object()) : fallback; }; auto arg_or = [this, &vm](size_t i, i32 fallback) { return vm.argument_count() > i ? vm.argument(i).to_i32(global_object()) : fallback; };
int year = vm().argument(0).to_i32(global_object()); int year = vm.argument(0).to_i32(global_object());
int month_index = vm().argument(1).to_i32(global_object()); int month_index = vm.argument(1).to_i32(global_object());
int day = arg_or(2, 1); int day = arg_or(2, 1);
int hours = arg_or(3, 0); int hours = arg_or(3, 0);
int minutes = arg_or(4, 0); int minutes = arg_or(4, 0);