beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 17:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibJS+LibC: Add tests for Date tuple ctor overflow and make mktime()/timegm() handle month overflow

Browse source
This commit is contained in:
Nico Weber 2020-08-23 21:37:03 -04:00 committed by Andreas Kling
parent 465d46c665
commit 84f729c2b4
Notes: sideshowbarker 2024-07-19 03:13:40 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/84f729c2b4d
Pull-request: https://github.com/SerenityOS/serenity/pull/3277
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibC/time.cpp
View file

@ -103,6 +103,13 @@ static void time_to_tm(struct tm* tm, time_t t)
static time_t tm_to_time(struct tm* tm, long timezone_adjust_seconds)
{
tm->tm_year += tm->tm_mon / 12;
tm->tm_mon %= 12;
if (tm->tm_mon < 0) {
tm->tm_year--;
tm->tm_mon += 12;
}
int days = 0;
for (int year = 70; year < tm->tm_year; ++year)
days += 365 + __is_leap_year(1900 + year);
@ -110,7 +117,6 @@ static time_t tm_to_time(struct tm* tm, long timezone_adjust_seconds)
days -= 365 + __is_leap_year(1900 + year);
tm->tm_yday = tm->tm_mday - 1;
// FIXME: What if tm->tm_mon < 0 or tm->tm_mon > 12?
for (int month = 0; month < tm->tm_mon; ++month)
tm->tm_yday += __days_per_month[month];
if (tm->tm_mon > 1 && __is_leap_year(1900 + tm->tm_year))

2
Libraries/LibJS/Runtime/DateConstructor.cpp
View file

@ -179,7 +179,6 @@ Value DateConstructor::construct(Interpreter& interpreter, Function&)
value = parse_simplified_iso8601(value.as_string().string());
// A timestamp since the epoch, in UTC.
// FIXME: Date() probably should use a double as internal representation, so that NaN arguments and larger offsets are handled correctly.
// FIXME: DateTime::from_timestamp() seems to not support negative offsets.
double value_as_double = value.to_double(interpreter);
auto datetime = Core::DateTime::from_timestamp(static_cast<time_t>(value_as_double / 1000));
auto milliseconds = static_cast<u16>(fmod(value_as_double, 1000));
@ -187,7 +186,6 @@ Value DateConstructor::construct(Interpreter& interpreter, Function&)
}
// 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 range-check args and convert months > 12 to year increments etc.
auto arg_or = [&interpreter](size_t i, i32 fallback) { return interpreter.argument_count() > i ? interpreter.argument(i).to_i32(interpreter) : fallback; };
int year = interpreter.argument(0).to_i32(interpreter);
int month_index = interpreter.argument(1).to_i32(interpreter);

20
Libraries/LibJS/Tests/builtins/Date/Date.UTC.js
View file

@ -25,3 +25,23 @@ test("basic functionality", () => {
expect(Date.UTC(20000, 0)).toBe(568971820800000);
});
test("out of range", () => {
expect(Date.UTC(2020, -20)).toBe(1525132800000);
expect(Date.UTC(2020, 20)).toBe(1630454400000);
expect(Date.UTC(2020, 1, -10)).toBe(1579564800000);
expect(Date.UTC(2020, 1, 40)).toBe(1583884800000);
expect(Date.UTC(2020, 1, 15, -50)).toBe(1581544800000);
expect(Date.UTC(2020, 1, 15, 50)).toBe(1581904800000);
expect(Date.UTC(2020, 1, 15, 12, -123)).toBe(1581760620000);
expect(Date.UTC(2020, 1, 15, 12, 123)).toBe(1581775380000);
expect(Date.UTC(2020, 1, 15, 12, 30, -123)).toBe(1581769677000);
expect(Date.UTC(2020, 1, 15, 12, 30, 123)).toBe(1581769923000);
expect(Date.UTC(2020, 1, 15, 12, 30, 30, -2345)).toBe(1581769827655);
expect(Date.UTC(2020, 1, 15, 12, 30, 30, 2345)).toBe(1581769832345);
});