Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: clamp negative setTimeout/setInterval delays to zero

Jay Hemnani5df27b9fa28a
diff --git a/src/browser/tests/window/timers.html b/src/browser/tests/window/timers.html
index 5c20dfa56..2f4825528 100644
--- a/src/browser/tests/window/timers.html
+++ b/src/browser/tests/window/timers.html
@@ -81,3 +81,17 @@
testing.expectEqual(true, threw);
</script>
+
+<script id=negative_and_overflowing_delay type=module>
+ {
+ const state = await testing.async();
+ const fired = [];
+ window.setTimeout(() => fired.push('negative'), -10);
+ window.setTimeout(() => fired.push('overflow'), 2 ** 31);
+ window.setTimeout(() => state.resolve(), 20);
+
+ await state.done(() => {
+ testing.expectEqual('negative,overflow', fired.join());
+ });
+ }
+</script>
diff --git a/src/browser/webapi/Timers.zig b/src/browser/webapi/Timers.zig
index 26dc3dda2..4058d9d90 100644
--- a/src/browser/webapi/Timers.zig
+++ b/src/browser/webapi/Timers.zig
@@ -88,6 +88,11 @@ const ScheduleOpts = struct {
mode: Mode = .normal,
};
+// setTimeout/setInterval take the delay as a WebIDL long: wrapped to 32 bits, negatives clamped to 0.
+pub fn delayFromJs(delay_ms: ?i32) u32 {
+ return @intCast(@max(delay_ms orelse 0, 0));
+}
+
pub fn schedule(
self: *Timers,
exec: *js.Execution,
diff --git a/src/browser/webapi/Window.zig b/src/browser/webapi/Window.zig
index 6205956b5..b94eff96a 100644
--- a/src/browser/webapi/Window.zig
+++ b/src/browser/webapi/Window.zig
@@ -521,18 +521,18 @@ pub fn fetch(_: *const Window, input: Fetch.Input, options: ?Fetch.InitOpts, exe
return Fetch.init(input, options, exec);
}
-pub fn setTimeout(self: *Window, handler: Timers.LegacyHandler, delay_ms: ?u32, params: []js.Value.Global, exec: *js.Execution) !u32 {
+pub fn setTimeout(self: *Window, handler: Timers.LegacyHandler, delay_ms: ?i32, params: []js.Value.Global, exec: *js.Execution) !u32 {
const cb = try handler.resolve(exec);
- return self._timers.schedule(exec, cb, delay_ms orelse 0, .{
+ return self._timers.schedule(exec, cb, Timers.delayFromJs(delay_ms), .{
.repeat = false,
.params = params,
.name = "window.setTimeout",
});
}
-pub fn setInterval(self: *Window, handler: Timers.LegacyHandler, delay_ms: ?u32, params: []js.Value.Global, exec: *js.Execution) !u32 {
+pub fn setInterval(self: *Window, handler: Timers.LegacyHandler, delay_ms: ?i32, params: []js.Value.Global, exec: *js.Execution) !u32 {
const cb = try handler.resolve(exec);
- return self._timers.schedule(exec, cb, delay_ms orelse 0, .{
+ return self._timers.schedule(exec, cb, Timers.delayFromJs(delay_ms), .{
.repeat = true,
.params = params,
.name = "window.setInterval",
diff --git a/src/browser/webapi/WorkerGlobalScope.zig b/src/browser/webapi/WorkerGlobalScope.zig
index f55d45b7f..95255f1b4 100644
--- a/src/browser/webapi/WorkerGlobalScope.zig
+++ b/src/browser/webapi/WorkerGlobalScope.zig
@@ -530,9 +530,9 @@ fn queueMicrotask(self: *WorkerGlobalScope, cb: JS.Function) void {
self.js.queueMicrotaskFunc(cb);
}
-pub fn setTimeout(self: *WorkerGlobalScope, handler: Timers.LegacyHandler, delay_ms: ?u32, params: []JS.Value.Global, exec: *JS.Execution) !u32 {
+pub fn setTimeout(self: *WorkerGlobalScope, handler: Timers.LegacyHandler, delay_ms: ?i32, params: []JS.Value.Global, exec: *JS.Execution) !u32 {
const cb = try handler.resolve(exec);
- return self._timers.schedule(exec, cb, delay_ms orelse 0, .{
+ return self._timers.schedule(exec, cb, Timers.delayFromJs(delay_ms), .{
.repeat = false,
.params = params,
.name = "worker.setTimeout",
@@ -543,9 +543,9 @@ fn clearTimeout(self: *WorkerGlobalScope, id: u32) void {
self._timers.clear(id);
}
-pub fn setInterval(self: *WorkerGlobalScope, handler: Timers.LegacyHandler, delay_ms: ?u32, params: []JS.Value.Global, exec: *JS.Execution) !u32 {
+pub fn setInterval(self: *WorkerGlobalScope, handler: Timers.LegacyHandler, delay_ms: ?i32, params: []JS.Value.Global, exec: *JS.Execution) !u32 {
const cb = try handler.resolve(exec);
- return self._timers.schedule(exec, cb, delay_ms orelse 0, .{
+ return self._timers.schedule(exec, cb, Timers.delayFromJs(delay_ms), .{
.repeat = true,
.params = params,
.name = "worker.setInterval",