Skip to content

Lightpanda: the headless browser designed for AI and automation

Make initStringHandle fallible

Karl Seguin5d76e184b304
diff --git a/src/browser/js/Context.zig b/src/browser/js/Context.zig
index a2deaf16a..5e674ec84 100644
--- a/src/browser/js/Context.zig
+++ b/src/browser/js/Context.zig
@@ -487,7 +487,7 @@ fn compileModule(local: *const js.Local, src: []const u8, name: []const u8) !js.
var origin_handle: v8.ScriptOrigin = undefined;
v8.v8__ScriptOrigin__CONSTRUCT2(
&origin_handle,
- local.isolate.initStringHandle(name),
+ try local.isolate.initStringHandle(name),
0, // resource_line_offset
0, // resource_column_offset
false, // resource_is_shared_cross_origin
@@ -501,7 +501,7 @@ fn compileModule(local: *const js.Local, src: []const u8, name: []const u8) !js.
var source_handle: v8.ScriptCompilerSource = undefined;
v8.v8__ScriptCompiler__Source__CONSTRUCT2(
- try local.isolate.newString(src),
+ try local.isolate.initStringHandle(src),
&origin_handle,
null, // cached data
&source_handle,
@@ -861,8 +861,7 @@ fn _dynamicModuleCallback(self: *Context, specifier: [:0]const u8, referrer: []c
// Next, we need to actually load it.
self.script_manager.getAsyncImport(specifier, dynamicModuleSourceCallback, state, referrer) catch |err| {
- const error_msg = local.newString(@errorName(err));
- _ = resolver.reject("dynamic module get async", error_msg);
+ _ = resolver.reject("dynamic module get async", @errorName(err));
};
// For now, we're done. but this will be continued in
@@ -899,7 +898,7 @@ fn _dynamicModuleCallback(self: *Context, specifier: [:0]const u8, referrer: []c
// the module was loaded, but not evaluated, we _have_ to evaluate it now
if (status == .kUninstantiated) {
if (try mod.instantiate(resolveModuleCallback) == false) {
- _ = resolver.reject("module instantiation", local.newString("Module instantiation failed"));
+ _ = resolver.reject("module instantiation", "Module instantiation failed");
return promise;
}
}
@@ -914,7 +913,7 @@ fn _dynamicModuleCallback(self: *Context, specifier: [:0]const u8, referrer: []c
} else if (comptime lp.IS_DEBUG) {
std.debug.assert(mod.getStatus() == .kErrored);
}
- _ = resolver.reject("module evaluation", local.newString("Module evaluation failed"));
+ _ = resolver.reject("module evaluation", "Module evaluation failed");
return promise;
};
lp.assert(evaluated.isPromise(), "Context._dynamicModuleCallback non-promise", .{});
@@ -955,7 +954,7 @@ fn dynamicModuleSourceCallback(ctx: *anyopaque, module_source_: anyerror!ScriptM
const resolver = local.toLocal(state.resolver);
switch (err) {
error.UrlMalformat, error.Abort, error.TransferCanceled => resolver.rejectError("dynamic module source", .{ .type_error = @errorName(err) }),
- else => _ = resolver.reject("dynamic module source", local.newString(@errorName(err))),
+ else => _ = resolver.reject("dynamic module source", @errorName(err)),
}
return;
};
@@ -973,7 +972,7 @@ fn dynamicModuleSourceCallback(ctx: *anyopaque, module_source_: anyerror!ScriptM
.caught = caught,
.specifier = state.specifier,
});
- _ = local.toLocal(state.resolver).reject("dynamic compilation failure", local.newString(caught.exception orelse ""));
+ _ = local.toLocal(state.resolver).reject("dynamic compilation failure", caught.exception orelse "");
return;
};
};
@@ -1053,7 +1052,7 @@ fn resolveDynamicModule(self: *Context, state: *DynamicModuleResolveState, modul
.err = err,
.specifier = state.specifier,
});
- _ = local.toLocal(state.resolver).reject("module promise", local.newString("Failed to evaluate promise"));
+ _ = local.toLocal(state.resolver).reject("module promise", "Failed to evaluate promise");
};
}
@@ -1251,7 +1250,7 @@ pub fn queueMicrotaskFunc(self: *Context, cb: js.Function) void {
}
// == Profiler ==
-fn startCpuProfiler(self: *Context) void {
+fn startCpuProfiler(self: *Context) !void {
if (comptime !lp.IS_DEBUG) {
// Still testing this out, don't have it properly exposed, so add this
// guard for the time being to prevent any accidental/weird prod issues.
@@ -1266,7 +1265,7 @@ fn startCpuProfiler(self: *Context) void {
v8.v8__CpuProfiler__UseDetailedSourcePositionsForProfiling(self.isolate.handle);
const cpu_profiler = v8.v8__CpuProfiler__Get(self.isolate.handle).?;
- const title = self.isolate.initStringHandle("v8_cpu_profile");
+ const title = try self.isolate.initStringHandle("v8_cpu_profile");
v8.v8__CpuProfiler__StartProfiling(cpu_profiler, title);
self.cpu_profiler = cpu_profiler;
}
@@ -1276,7 +1275,7 @@ fn stopCpuProfiler(self: *Context) ![]const u8 {
self.localScope(&ls);
defer ls.deinit();
- const title = self.isolate.initStringHandle("v8_cpu_profile");
+ const title = try self.isolate.initStringHandle("v8_cpu_profile");
const handle = v8.v8__CpuProfiler__StopProfiling(self.cpu_profiler.?, title) orelse return error.NoProfiles;
const string_handle = v8.v8__CpuProfile__Serialize(handle, self.isolate.handle) orelse return error.NoProfile;
return (js.String{ .local = &ls.local, .handle = string_handle }).toSlice();
diff --git a/src/browser/js/Function.zig b/src/browser/js/Function.zig
index acd2418f0..36e3c423d 100644
--- a/src/browser/js/Function.zig
+++ b/src/browser/js/Function.zig
@@ -269,7 +269,7 @@ pub fn src(self: *const Function) ![]const u8 {
pub fn getPropertyValue(self: *const Function, name: []const u8) !?js.Value {
const local = self.local;
- const key = local.isolate.initStringHandle(name);
+ const key = try local.isolate.initStringHandle(name);
const handle = v8.v8__Object__Get(self.handle, self.local.handle, key) orelse {
return error.JsException;
};
diff --git a/src/browser/js/Isolate.zig b/src/browser/js/Isolate.zig
index 94a67f374..237199b33 100644
--- a/src/browser/js/Isolate.zig
+++ b/src/browser/js/Isolate.zig
@@ -72,47 +72,49 @@ pub fn throwException(self: Isolate, value: *const v8.Value) *const v8.Value {
return v8.v8__Isolate__ThrowException(self.handle, value).?;
}
-// For short strings (names, keys, messages). Page or network data goes
-// through newString.
-pub fn initStringHandle(self: Isolate, str: []const u8) *const v8.String {
- return self.newString(str) catch unreachable;
-}
-
// Past v8::String::kMaxLength (just under 512 MiB on 64-bit) V8 returns an
// empty handle; callers turn the error into "RangeError: Invalid string
// length", as V8 throws for its own over-long strings.
-pub fn newString(self: Isolate, str: []const u8) error{InvalidStringLength}!*const v8.String {
+pub fn initStringHandle(self: Isolate, str: []const u8) error{InvalidStringLength}!*const v8.String {
const len = std.math.cast(c_int, str.len) orelse return error.InvalidStringLength;
return v8.v8__String__NewFromUtf8(self.handle, str.ptr, v8.kNormal, len) orelse error.InvalidStringLength;
}
-pub fn newOneByteString(self: Isolate, bytes: []const u8) error{InvalidStringLength}!*const v8.String {
+pub fn initOneByteStringHandle(self: Isolate, bytes: []const u8) error{InvalidStringLength}!*const v8.String {
const len = std.math.cast(c_int, bytes.len) orelse return error.InvalidStringLength;
return v8.v8__String__NewFromOneByte(self.handle, bytes.ptr, v8.kNormal, len) orelse error.InvalidStringLength;
}
+// Error constructors run while an error is already being reported, so they
+// can't fail: a message is capped well below V8's limit.
+fn initMessageHandle(self: Isolate, msg: []const u8) *const v8.String {
+ const max_message_len = 64 * 1024;
+ const len: c_int = @intCast(@min(msg.len, max_message_len));
+ return v8.v8__String__NewFromUtf8(self.handle, msg.ptr, v8.kNormal, len).?;
+}
+
pub fn createError(self: Isolate, msg: []const u8) *const v8.Value {
- const message = self.initStringHandle(msg);
+ const message = self.initMessageHandle(msg);
return v8.v8__Exception__Error(message).?;
}
pub fn createRangeError(self: Isolate, msg: []const u8) *const v8.Value {
- const message = self.initStringHandle(msg);
+ const message = self.initMessageHandle(msg);
return v8.v8__Exception__RangeError(message).?;
}
pub fn createReferenceError(self: Isolate, msg: []const u8) *const v8.Value {
- const message = self.initStringHandle(msg);
+ const message = self.initMessageHandle(msg);
return v8.v8__Exception__ReferenceError(message).?;
}
pub fn createSyntaxError(self: Isolate, msg: []const u8) *const v8.Value {
- const message = self.initStringHandle(msg);
+ const message = self.initMessageHandle(msg);
return v8.v8__Exception__SyntaxError(message).?;
}
pub fn createTypeError(self: Isolate, msg: []const u8) *const v8.Value {
- const message = self.initStringHandle(msg);
+ const message = self.initMessageHandle(msg);
return v8.v8__Exception__TypeError(message).?;
}
diff --git a/src/browser/js/Local.zig b/src/browser/js/Local.zig
index 0dfc30ea6..beb9e94f8 100644
--- a/src/browser/js/Local.zig
+++ b/src/browser/js/Local.zig
@@ -58,10 +58,10 @@ handle: *const v8.Context,
isolate: Isolate,
call_arena: std.mem.Allocator,
-pub fn newString(self: *const Local, str: []const u8) js.String {
+pub fn newString(self: *const Local, str: []const u8) !js.String {
return .{
.local = self,
- .handle = self.isolate.initStringHandle(str),
+ .handle = try self.isolate.initStringHandle(str),
};
}
@@ -80,7 +80,7 @@ pub fn newDate(self: *const Local, time_ms: f64) !js.Value {
// StringToBigInt semantics: arbitrary precision, sign-aware, and it never
// consults the page's globals. Fails on non-numeric digits.
pub fn newBigInt(self: *const Local, digits: []const u8) !js.Value {
- const str: *const v8.Value = @ptrCast(self.isolate.initStringHandle(digits));
+ const str: *const v8.Value = @ptrCast(try self.isolate.initStringHandle(digits));
const handle = v8.v8__Value__ToBigInt(str, self.handle) orelse return error.JsException;
return .{ .local = self, .handle = @ptrCast(handle) };
}
@@ -149,12 +149,12 @@ pub fn compileFunction(
extensions: []const *const v8.Object,
) !js.Function {
// TODO: Make configurable.
- const script_name = self.isolate.initStringHandle("anonymous");
- const script_source = if (@TypeOf(src) == js.String) src.handle else try self.isolate.newString(src);
+ const script_name = try self.isolate.initStringHandle("anonymous");
+ const script_source = if (@TypeOf(src) == js.String) src.handle else try self.isolate.initStringHandle(src);
var parameter_list: [parameter_names.len]*const v8.String = undefined;
inline for (0..parameter_names.len) |i| {
- parameter_list[i] = self.isolate.initStringHandle(parameter_names[i]);
+ parameter_list[i] = try self.isolate.initStringHandle(parameter_names[i]);
}
// Create `ScriptOrigin`.
@@ -204,8 +204,8 @@ const CompileResult = struct {
// Like compile, but takes an optional cached_data which is a previously
// compiled and serialized script (see Script.Unbound.createCodeCache)
pub fn compileWithCache(self: *const Local, src: []const u8, name: ?[]const u8, cached_data: ?[]const u8) !CompileResult {
- const script_name = self.isolate.initStringHandle(name orelse "anonymous");
- const script_source = try self.isolate.newString(src);
+ const script_name = try self.isolate.initStringHandle(name orelse "anonymous");
+ const script_source = try self.isolate.initStringHandle(src);
// Create ScriptOrigin
var origin: v8.ScriptOrigin = undefined;
@@ -533,10 +533,10 @@ fn zigJsonToJs(self: *const Local, value: std.json.Value) !js.Value {
const isolate = self.isolate;
switch (value) {
- .bool => |v| return .{ .local = self, .handle = js.simpleZigValueToJs(isolate, v, true, false) },
- .float => |v| return .{ .local = self, .handle = js.simpleZigValueToJs(isolate, v, true, false) },
- .integer => |v| return .{ .local = self, .handle = js.simpleZigValueToJs(isolate, v, true, false) },
- .string => |v| return .{ .local = self, .handle = js.simpleZigValueToJs(isolate, v, true, false) },
+ .bool => |v| return .{ .local = self, .handle = try js.simpleZigValueToJs(isolate, v, true, false) },
+ .float => |v| return .{ .local = self, .handle = try js.simpleZigValueToJs(isolate, v, true, false) },
+ .integer => |v| return .{ .local = self, .handle = try js.simpleZigValueToJs(isolate, v, true, false) },
+ .string => |v| return .{ .local = self, .handle = try js.simpleZigValueToJs(isolate, v, true, false) },
.null => return .{ .local = self, .handle = isolate.initNull() },
// TODO handle number_string.
@@ -881,7 +881,7 @@ fn jsValueToStruct(self: *const Local, comptime T: type, js_val: js.Value) !?T {
if (comptime std.mem.eql(u8, name, dictionary_group_marker)) {
continue;
}
- const key = isolate.initStringHandle(name);
+ const key = try isolate.initStringHandle(name);
if (js_obj.has(key)) {
const member = try js_obj.get(key);
const default_for_undefined = comptime attrs.defaultValue(FieldType);
@@ -1573,7 +1573,7 @@ pub fn createPromiseResolver(self: *const Local) js.PromiseResolver {
// == Misc ==
pub fn parseJSON(self: *const Local, json: []const u8) !js.Value {
- const string_handle = try self.isolate.newString(json);
+ const string_handle = try self.isolate.initStringHandle(json);
const value_handle = v8.v8__JSON__Parse(self.handle, string_handle) orelse return error.JsException;
return .{
.local = self,
diff --git a/src/browser/js/Object.zig b/src/browser/js/Object.zig
index da165d0f6..8ec23b56e 100644
--- a/src/browser/js/Object.zig
+++ b/src/browser/js/Object.zig
@@ -28,7 +28,8 @@ handle: *const v8.Object,
pub fn has(self: Object, key: anytype) bool {
const ctx = self.local.ctx;
- const key_handle = if (@TypeOf(key) == *const v8.String) key else ctx.isolate.initStringHandle(key);
+ // No property has a key longer than V8 accepts.
+ const key_handle = if (@TypeOf(key) == *const v8.String) key else ctx.isolate.initStringHandle(key) catch return false;
var out: v8.MaybeBool = undefined;
v8.v8__Object__Has(self.handle, self.local.handle, key_handle, &out);
@@ -41,7 +42,7 @@ pub fn has(self: Object, key: anytype) bool {
pub fn get(self: Object, key: anytype) !js.Value {
const ctx = self.local.ctx;
- const key_handle = if (@TypeOf(key) == *const v8.String) key else ctx.isolate.initStringHandle(key);
+ const key_handle = if (@TypeOf(key) == *const v8.String) key else try ctx.isolate.initStringHandle(key);
const js_val_handle = v8.v8__Object__Get(self.handle, self.local.handle, key_handle) orelse return error.JsException;
return .{
@@ -62,7 +63,7 @@ pub fn set(self: Object, key: anytype, value: anytype, comptime opts: js.Caller.
const ctx = self.local.ctx;
const js_value = try self.local.zigValueToJs(value, opts);
- const key_handle = if (@TypeOf(key) == *const v8.String) key else ctx.isolate.initStringHandle(key);
+ const key_handle = if (@TypeOf(key) == *const v8.String) key else try ctx.isolate.initStringHandle(key);
var out: v8.MaybeBool = undefined;
v8.v8__Object__Set(self.handle, self.local.handle, key_handle, js_value.handle, &out);
@@ -71,7 +72,7 @@ pub fn set(self: Object, key: anytype, value: anytype, comptime opts: js.Caller.
pub fn defineOwnProperty(self: Object, name: []const u8, value: js.Value, attr: v8.PropertyAttribute) ?bool {
const ctx = self.local.ctx;
- const name_handle = ctx.isolate.initStringHandle(name);
+ const name_handle = ctx.isolate.initStringHandle(name) catch return null;
var out: v8.MaybeBool = undefined;
v8.v8__Object__DefineOwnProperty(self.handle, self.local.handle, @ptrCast(name_handle), value.handle, attr, &out);
@@ -104,7 +105,7 @@ pub fn getFunction(self: Object, name: []const u8) !?js.Function {
}
const local = self.local;
- const js_name = local.isolate.initStringHandle(name);
+ const js_name = try local.isolate.initStringHandle(name);
const js_val_handle = v8.v8__Object__Get(self.handle, local.handle, js_name) orelse return error.JsException;
if (v8.v8__Value__IsFunction(js_val_handle) == false) {
diff --git a/src/browser/js/Origin.zig b/src/browser/js/Origin.zig
index 93a724557..1e853ed45 100644
--- a/src/browser/js/Origin.zig
+++ b/src/browser/js/Origin.zig
@@ -52,7 +52,7 @@ pub fn init(app: *App, isolate: js.Isolate, key: []const u8) !*Origin {
defer hs.deinit();
const owned_key = try arena.dupe(u8, key);
- const token_local = isolate.initStringHandle(owned_key);
+ const token_local = try isolate.initStringHandle(owned_key);
var token_global: v8.Global = undefined;
v8.v8__Global__New(isolate.handle, token_local, &token_global);
diff --git a/src/browser/js/RegExp.zig b/src/browser/js/RegExp.zig
index 7066ea16c..5168e1b73 100644
--- a/src/browser/js/RegExp.zig
+++ b/src/browser/js/RegExp.zig
@@ -45,7 +45,7 @@ pub const InitOpts = struct {
};
pub fn init(local: *const js.Local, pattern: []const u8, opts: InitOpts) !RegExp {
- const pattern_handle = local.isolate.initStringHandle(pattern);
+ const pattern_handle = try local.isolate.initStringHandle(pattern);
const handle = if (opts.backtrack_limit) |limit|
v8.v8__RegExp__NewWithBacktrackLimit(local.handle, pattern_handle, opts.flags, limit)
else
@@ -58,7 +58,7 @@ pub fn init(local: *const js.Local, pattern: []const u8, opts: InitOpts) !RegExp
// throws — typically when the pattern is malformed for the current flags.
pub fn exec(self: RegExp, subject: []const u8) !?js.Object {
const local = self.local;
- const subject_handle = local.isolate.initStringHandle(subject);
+ const subject_handle = try local.isolate.initStringHandle(subject);
const handle = v8.v8__RegExp__Exec(self.handle, local.handle, subject_handle) orelse return error.JsException;
if (v8.v8__Value__IsNullOrUndefined(@ptrCast(handle))) return null;
return .{ .local = local, .handle = handle };
diff --git a/src/browser/js/Value.zig b/src/browser/js/Value.zig
index a2ab7fa6f..bf3b7a7e6 100644
--- a/src/browser/js/Value.zig
+++ b/src/browser/js/Value.zig
@@ -898,13 +898,14 @@ const Inert = struct {
fn ownDataProperty(self: *State, object: *const v8.Object, key: []const u8) ?*const v8.Value {
const local = self.local;
- const descriptor = v8.v8__Object__GetOwnPropertyDescriptor(object, local.handle, local.isolate.initStringHandle(key)) orelse return null;
+ const key_handle = local.isolate.initStringHandle(key) catch return null;
+ const descriptor = v8.v8__Object__GetOwnPropertyDescriptor(object, local.handle, key_handle) orelse return null;
if (v8.v8__Value__IsObject(descriptor) == false) {
return null;
}
// An accessor descriptor has no own `value`, and a Get would then reach Object.prototype.
- const value_key = local.isolate.initStringHandle("value");
+ const value_key = local.isolate.initStringHandle("value") catch return null;
var has: v8.MaybeBool = undefined;
v8.v8__Object__HasOwnProperty(@ptrCast(descriptor), local.handle, value_key, &has);
if (has.has_value == false or has.value == false) {
diff --git a/src/browser/js/js.zig b/src/browser/js/js.zig
index 426b3749b..97b79667b 100644
--- a/src/browser/js/js.zig
+++ b/src/browser/js/js.zig
@@ -391,12 +391,12 @@ pub fn simpleZigValueToJs(isolate: Isolate, value: anytype, comptime fail: bool,
.float, .comptime_float => return @ptrCast(isolate.initNumber(value).handle),
.pointer => |ptr| {
if (ptr.size == .slice and ptr.child == u8) {
- return @ptrCast(try isolate.newString(value));
+ return @ptrCast(try isolate.initStringHandle(value));
}
if (ptr.size == .one) {
const one_info = @typeInfo(ptr.child);
if (one_info == .array and one_info.array.child == u8) {
- return @ptrCast(try isolate.newString(value));
+ return @ptrCast(try isolate.initStringHandle(value));
}
}
},
@@ -412,8 +412,8 @@ pub fn simpleZigValueToJs(isolate: Isolate, value: anytype, comptime fail: bool,
},
.@"struct" => {
switch (@TypeOf(value)) {
- string.String => return @ptrCast(try isolate.newString(value.str())),
- String.OneByte => return @ptrCast(try isolate.newOneByteString(value.bytes)),
+ string.String => return @ptrCast(try isolate.initStringHandle(value.str())),
+ String.OneByte => return @ptrCast(try isolate.initOneByteStringHandle(value.bytes)),
ArrayBuffer => {
const values = value.values;
const len = values.len;
@@ -623,6 +623,8 @@ test "js: a string longer than V8 accepts fails with RangeError instead of crash
const res = try driver_fn.call([]const u8, .{local.newCallback(State.text, &state)});
try testing.expectEqual("RangeError: Invalid string length", res);
+ // Nothing handles the rejection.
+ testing.expectLog(&.{.page_error});
const promise = try local.resolvePromise(str);
try testing.expectEqual(.rejected, promise.state());
try testing.expectEqual("RangeError: Invalid string length", try promise.result().toStringSmart());
diff --git a/src/browser/webapi/WebDriver.zig b/src/browser/webapi/WebDriver.zig
index d3e839b5f..6bbebdbbb 100644
--- a/src/browser/webapi/WebDriver.zig
+++ b/src/browser/webapi/WebDriver.zig
@@ -163,7 +163,7 @@ const ActionSequence = struct {
defer ls.deinit();
performSources(self, &ls) catch |err| {
- ls.toLocal(self.resolver).reject("WebDriver.actionSequence", ls.local.newString(@errorName(err)));
+ ls.toLocal(self.resolver).reject("WebDriver.actionSequence", @errorName(err));
return err;
};
diff --git a/src/browser/webapi/encoding/TextEncoder.zig b/src/browser/webapi/encoding/TextEncoder.zig
index 406472777..6a11ab183 100644
--- a/src/browser/webapi/encoding/TextEncoder.zig
+++ b/src/browser/webapi/encoding/TextEncoder.zig
@@ -31,9 +31,9 @@ pub fn encode(_: *const TextEncoder, v_: ?js.Value, exec: *const js.Execution) !
// The input is an optional USVString defaulting to "": undefined is the
// default, anything else (null included) is stringified.
const source = blk: {
- const v = v_ orelse break :blk local.newString("");
+ const v = v_ orelse break :blk try local.newString("");
if (v.isUndefined()) {
- break :blk local.newString("");
+ break :blk try local.newString("");
}
break :blk try v.toString();
};
diff --git a/src/browser/webapi/storage/idb/Key.zig b/src/browser/webapi/storage/idb/Key.zig
index 72c4b8c30..9209d16c8 100644
--- a/src/browser/webapi/storage/idb/Key.zig
+++ b/src/browser/webapi/storage/idb/Key.zig
@@ -216,7 +216,7 @@ fn toJs(value: Value, local: *const Local) !js.Value {
switch (value) {
.number => |n| return local.zigValueToJs(n, .{}),
.date => |n| return local.newDate(n),
- .string => |s| return local.newString(s).toValue(),
+ .string => |s| return (try local.newString(s)).toValue(),
.binary => |s| return local.zigValueToJs(js.ArrayBuffer{ .values = s }, .{}),
.array => |items| {
const arr = local.newArray(@intCast(items.len));
@@ -319,11 +319,11 @@ pub fn extractKeyPath(local: *const Local, value: js.Value, kp: KeyPath) !?js.Va
pub fn keyPathToJs(local: *const Local, kp: ?KeyPath) !js.Value {
const path = kp orelse return .{ .local = local, .handle = local.isolate.initNull() };
switch (path) {
- .string => |s| return local.newString(s).toValue(),
+ .string => |s| return (try local.newString(s)).toValue(),
.list => |items| {
const arr = local.newArray(@intCast(items.len));
for (items, 0..) |item, i| {
- _ = try arr.set(@intCast(i), local.newString(item).toValue(), .{});
+ _ = try arr.set(@intCast(i), item, .{});
}
return arr.toValue();
},
diff --git a/src/script/Runtime.zig b/src/script/Runtime.zig
index f8d86ec94..113a22ef0 100644
--- a/src/script/Runtime.zig
+++ b/src/script/Runtime.zig
@@ -261,7 +261,7 @@ fn setObjectProperty(
v8.v8__Object__Set(
object,
context,
- @ptrCast(self.env.isolate.initStringHandle(name)),
+ @ptrCast(self.env.isolate.initStringHandle(name) catch return error.RuntimeInitFailed),
value,
&out,
);
@@ -288,7 +288,8 @@ pub fn runSource(self: *Runtime, source: []const u8, name: []const u8) RunError!
v8.v8__TryCatch__CONSTRUCT(&try_catch, self.env.isolate.handle);
defer v8.v8__TryCatch__DESTRUCT(&try_catch);
- const script_name = self.env.isolate.initStringHandle(name);
+ const script_name = self.env.isolate.initStringHandle(name) catch
+ return try self.dupeError("RangeError: Invalid string length");
// Wrap in an async IIFE so the source can use top-level `await` (e.g.
// `await page.goto(...)`). The wrapper evaluates to a Promise; a top-level
// `return <expr>` becomes that Promise's value, which we echo. (A bare
@@ -296,7 +297,8 @@ pub fn runSource(self: *Runtime, source: []const u8, name: []const u8) RunError!
// completion value are mutually exclusive in JS.)
const wrapped = self.call_arena.allocator().print("(async () => {{\n{s}\n}})()", .{source}) catch
return try self.dupeError("out of memory");
- const script_source = self.env.isolate.initStringHandle(wrapped);
+ const script_source = self.env.isolate.initStringHandle(wrapped) catch
+ return try self.dupeError("RangeError: Invalid string length");
var origin: v8.ScriptOrigin = undefined;
v8.v8__ScriptOrigin__CONSTRUCT(&origin, script_name);
@@ -353,7 +355,7 @@ fn formatRejection(self: *Runtime, context: *const v8.Context, reason: *const v8
/// Error-like object — in which case the caller stringifies the value itself.
fn errorMessage(self: *Runtime, context: *const v8.Context, reason: *const v8.Value) ?*const v8.Value {
if (!v8.v8__Value__IsObject(reason)) return null;
- const key: *const v8.Value = @ptrCast(self.env.isolate.initStringHandle("message"));
+ const key: *const v8.Value = @ptrCast(self.env.isolate.initStringHandle("message") catch return null);
const message = v8.v8__Object__Get(@ptrCast(reason), context, key) orelse return null;
return if (v8.v8__Value__IsString(message)) message else null;
}
@@ -683,7 +685,7 @@ fn bindFrameId(self: *Runtime, context: *const v8.Context, this: *const v8.Objec
/// the page was never navigated or has been closed.
fn receiverFrameId(self: *Runtime, context: *const v8.Context, info: *const v8.FunctionCallbackInfo) ?u32 {
const this = v8.v8__FunctionCallbackInfo__This(info) orelse return null;
- const key: *const v8.Value = @ptrCast(self.env.isolate.initStringHandle(frame_id_key));
+ const key: *const v8.Value = @ptrCast(self.env.isolate.initStringHandle(frame_id_key) catch return null);
const prop = v8.v8__Object__Get(this, context, key) orelse return null;
if (!v8.v8__Value__IsNumber(prop)) return null;
var out: v8.MaybeU32 = undefined;
@@ -897,7 +899,11 @@ fn normalizeExtractReturnJson(_: *Runtime, arena: std.mem.Allocator, value: []co
}
fn setReturnString(self: *Runtime, info: *const v8.FunctionCallbackInfo, value: []const u8) void {
- self.setReturnValue(info, @ptrCast(self.env.isolate.initStringHandle(value)));
+ const str = self.env.isolate.initStringHandle(value) catch {
+ self.throwRangeError("Invalid string length");
+ return;
+ };
+ self.setReturnValue(info, @ptrCast(str));
}
fn setReturnJson(self: *Runtime, context: *const v8.Context, info: *const v8.FunctionCallbackInfo, value: []const u8) void {
@@ -905,7 +911,10 @@ fn setReturnJson(self: *Runtime, context: *const v8.Context, info: *const v8.Fun
self.setReturnValue(info, self.env.isolate.initUndefined());
return;
}
- const json = self.env.isolate.initStringHandle(value);
+ const json = self.env.isolate.initStringHandle(value) catch {
+ self.throwRangeError("Invalid string length");
+ return;
+ };
const parsed = v8.v8__JSON__Parse(context, json) orelse {
self.throwError("extract returned invalid JSON");
return;
@@ -923,6 +932,10 @@ fn throwError(self: *Runtime, message: []const u8) void {
_ = v8.v8__Isolate__ThrowException(self.env.isolate.handle, self.env.isolate.createError(message));
}
+fn throwRangeError(self: *Runtime, message: []const u8) void {
+ _ = v8.v8__Isolate__ThrowException(self.env.isolate.handle, self.env.isolate.createRangeError(message));
+}
+
fn throwTypeError(self: *Runtime, message: []const u8) void {
_ = v8.v8__Isolate__ThrowException(self.env.isolate.handle, self.env.isolate.createTypeError(message));
}
diff --git a/src/server/bidi/remote_value.zig b/src/server/bidi/remote_value.zig
index ef0a91e64..3f11352ff 100644
--- a/src/server/bidi/remote_value.zig
+++ b/src/server/bidi/remote_value.zig
@@ -330,6 +330,7 @@ pub const Serializer = struct {
ExecutionTerminated,
MethodNotFound,
DeadFunctionHandle,
+ InvalidStringLength,
};
fn remote(self: *Serializer, value: js.Value, depth: u32, own: bool) Error!Remote {