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

LibJS/Temporal: Perform floating point arithmetic in RoundTime

Browse source 
The valid range for temporal values (`nsMinInstant`/`nsMaxInstant`)
means performing nanosecond-valued integers could lead to an overflow.

NB: Only the `roundingMode: "day"` case was affected, as all others were
already performing the division on floating-point `fractional_second`
values. I'm adding `.0` suffixes everywhere to make this fact clearer.

This adds a few local tests as well, as those are tested with sanitizers
enabled by default, unlike test262.
This commit is contained in:
Daniel Bertalan 2023-06-29 20:48:52 +02:00 committed by Andreas Kling
parent 1dce1994eb
commit 96b197ef46
Notes: sideshowbarker 2024-07-16 23:44:30 +09:00 
Author: https://github.com/BertalanD
Commit: https://github.com/SerenityOS/serenity/commit/96b197ef46
Pull-request: https://github.com/SerenityOS/serenity/pull/19709
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibJS/Runtime/Temporal/PlainTime.cpp
View file

@ -559,17 +559,17 @@ DaysAndTime round_time(u8 hour, u8 minute, u8 second, u16 millisecond, u16 micro
day_length_ns = ns_per_day; day_length_ns = ns_per_day;
// b. Let quantity be (((((hour × 60 + minute) × 60 + second) × 1000 + millisecond) × 1000 + microsecond) × 1000 + nanosecond) / dayLengthNs. // b. Let quantity be (((((hour × 60 + minute) × 60 + second) × 1000 + millisecond) × 1000 + microsecond) × 1000 + nanosecond) / dayLengthNs.
quantity = (((((hour * 60 + minute) * 60 + second) * 1000 + millisecond) * 1000 + microsecond) * 1000 + nanosecond) / *day_length_ns; quantity = (((((hour * 60.0 + minute) * 60.0 + second) * 1000.0 + millisecond) * 1000.0 + microsecond) * 1000.0 + nanosecond) / *day_length_ns;
} }
// 4. Else if unit is "hour", then // 4. Else if unit is "hour", then
else if (unit == "hour"sv) { else if (unit == "hour"sv) {
// a. Let quantity be (fractionalSecond / 60 + minute) / 60 + hour. // a. Let quantity be (fractionalSecond / 60 + minute) / 60 + hour.
quantity = (fractional_second / 60 + minute) / 60 + hour; quantity = (fractional_second / 60.0 + minute) / 60.0 + hour;
} }
// 5. Else if unit is "minute", then // 5. Else if unit is "minute", then
else if (unit == "minute"sv) { else if (unit == "minute"sv) {
// a. Let quantity be fractionalSecond / 60 + minute. // a. Let quantity be fractionalSecond / 60 + minute.
quantity = fractional_second / 60 + minute; quantity = fractional_second / 60.0 + minute;
} }
// 6. Else if unit is "second", then // 6. Else if unit is "second", then
else if (unit == "second"sv) { else if (unit == "second"sv) {

22
Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDateTime/PlainDateTime.prototype.round.js
View file

@ -88,6 +88,28 @@ describe("correct behavior", () => {
plainDateTime.round("minute").equals(plainDateTime.round({ smallestUnit: "minute" })) plainDateTime.round("minute").equals(plainDateTime.round({ smallestUnit: "minute" }))
).toBeTrue(); ).toBeTrue();
}); });
test("range boundary conditions", () => {
// PlainDateTime can represent a point of time ±10**8 days from the epoch.
const min = new Temporal.PlainDateTime(-271821, 4, 19, 0, 0, 0, 0, 0, 1);
const max = new Temporal.PlainDateTime(275760, 9, 13, 23, 59, 59, 999, 999, 999);
["day", "hour", "minute", "second", "millisecond", "microsecond"].forEach(smallestUnit => {
expect(() => {
min.round({ smallestUnit, roundingMode: "floor" });
}).toThrow(RangeError);
expect(() => {
min.round({ smallestUnit, roundingMode: "ceil" });
}).not.toThrow();
expect(() => {
max.round({ smallestUnit, roundingMode: "floor" });
}).not.toThrow();
expect(() => {
max.round({ smallestUnit, roundingMode: "ceil" });
}).toThrow(RangeError);
});
});
}); });
describe("errors", () => { describe("errors", () => {