public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-29 15:13:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #936 from lightpanda-io/runtime-empty-array

Browse Source 
Fix crashes with empty array
This commit is contained in:
Karl Seguin
2025-08-09 07:36:09 +08:00
committed by GitHub
parent 8552a5797c f463cb16da
commit 05ad77ffbe
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/runtime/js.zig
View File

@@ -976,6 +976,7 @@ pub fn Env(comptime State: type, comptime WebApis: type) type {
// need this sentinel check to keep the compiler happy // need this sentinel check to keep the compiler happy
if (ptr.sentinel() == null) { if (ptr.sentinel() == null) {
if (force_u8 or js_value.isUint8Array() or js_value.isUint8ClampedArray()) { if (force_u8 or js_value.isUint8Array() or js_value.isUint8ClampedArray()) {
if (byte_len == 0) return &[_]u8{};
const arr_ptr = @as([*]u8, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]u8, @alignCast(@ptrCast(data)));
return arr_ptr[0..byte_len]; return arr_ptr[0..byte_len];
} }
@@ -983,42 +984,49 @@ pub fn Env(comptime State: type, comptime WebApis: type) type {
}, },
i8 => { i8 => {
if (js_value.isInt8Array()) { if (js_value.isInt8Array()) {
if (byte_len == 0) return &[_]i8{};
const arr_ptr = @as([*]i8, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]i8, @alignCast(@ptrCast(data)));
return arr_ptr[0..byte_len]; return arr_ptr[0..byte_len];
} }
}, },
u16 => { u16 => {
if (js_value.isUint16Array()) { if (js_value.isUint16Array()) {
if (byte_len == 0) return &[_]u16{};
const arr_ptr = @as([*]u16, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]u16, @alignCast(@ptrCast(data)));
return arr_ptr[0 .. byte_len / 2]; return arr_ptr[0 .. byte_len / 2];
} }
}, },
i16 => { i16 => {
if (js_value.isInt16Array()) { if (js_value.isInt16Array()) {
if (byte_len == 0) return &[_]i16{};
const arr_ptr = @as([*]i16, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]i16, @alignCast(@ptrCast(data)));
return arr_ptr[0 .. byte_len / 2]; return arr_ptr[0 .. byte_len / 2];
} }
}, },
u32 => { u32 => {
if (js_value.isUint32Array()) { if (js_value.isUint32Array()) {
if (byte_len == 0) return &[_]u32{};
const arr_ptr = @as([*]u32, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]u32, @alignCast(@ptrCast(data)));
return arr_ptr[0 .. byte_len / 4]; return arr_ptr[0 .. byte_len / 4];
} }
}, },
i32 => { i32 => {
if (js_value.isInt32Array()) { if (js_value.isInt32Array()) {
if (byte_len == 0) return &[_]i32{};
const arr_ptr = @as([*]i32, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]i32, @alignCast(@ptrCast(data)));
return arr_ptr[0 .. byte_len / 4]; return arr_ptr[0 .. byte_len / 4];
} }
}, },
u64 => { u64 => {
if (js_value.isBigUint64Array()) { if (js_value.isBigUint64Array()) {
if (byte_len == 0) return &[_]u64{};
const arr_ptr = @as([*]u64, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]u64, @alignCast(@ptrCast(data)));
return arr_ptr[0 .. byte_len / 8]; return arr_ptr[0 .. byte_len / 8];
} }
}, },
i64 => { i64 => {
if (js_value.isBigInt64Array()) { if (js_value.isBigInt64Array()) {
if (byte_len == 0) return &[_]i64{};
const arr_ptr = @as([*]i64, @alignCast(@ptrCast(data))); const arr_ptr = @as([*]i64, @alignCast(@ptrCast(data)));
return arr_ptr[0 .. byte_len / 8]; return arr_ptr[0 .. byte_len / 8];
} }
@@ -3469,11 +3477,16 @@ fn simpleZigValueToJs(isolate: v8.Isolate, value: anytype, comptime fail: bool)
else => @compileError("Invalid TypeArray type: " ++ @typeName(value_type)), else => @compileError("Invalid TypeArray type: " ++ @typeName(value_type)),
}; };
const buffer_len = len * bits / 8; var array_buffer: v8.ArrayBuffer = undefined;
const backing_store = v8.BackingStore.init(isolate, buffer_len); if (len == 0) {
const data: [*]u8 = @alignCast(@ptrCast(backing_store.getData())); array_buffer = v8.ArrayBuffer.init(isolate, 0);
@memcpy(data[0..buffer_len], @as([]const u8, @ptrCast(values))[0..buffer_len]); } else {
const array_buffer = v8.ArrayBuffer.initWithBackingStore(isolate, &backing_store.toSharedPtr()); const buffer_len = len * bits / 8;
const backing_store = v8.BackingStore.init(isolate, buffer_len);
const data: [*]u8 = @alignCast(@ptrCast(backing_store.getData()));
@memcpy(data[0..buffer_len], @as([]const u8, @ptrCast(values))[0..buffer_len]);
array_buffer = v8.ArrayBuffer.initWithBackingStore(isolate, &backing_store.toSharedPtr());
}
switch (@typeInfo(value_type)) { switch (@typeInfo(value_type)) {
.int => |n| switch (n.signedness) { .int => |n| switch (n.signedness) {

9
src/runtime/test_primitive_types.zig
View File

@@ -118,6 +118,10 @@ const Primitives = struct {
} }
} }
pub fn _returnEmptyUint8(_: *const Primitives) Env.TypedArray(u8) {
return .{ .values = &.{} };
}
pub fn _returnUint8(_: *const Primitives) Env.TypedArray(u8) { pub fn _returnUint8(_: *const Primitives) Env.TypedArray(u8) {
return .{ .values = &.{ 10, 20, 250 } }; return .{ .values = &.{ 10, 20, 250 } };
} }
@@ -277,6 +281,10 @@ test "JS: primitive types" {
// typed arrays // typed arrays
try runner.testCases(&.{ try runner.testCases(&.{
.{ "let empty_arr = new Int8Array([]);", "undefined" },
.{ "p.int8(empty_arr)", "undefined" },
.{ "empty_arr;", "" },
.{ "let arr_i8 = new Int8Array([-10, -20, -30]);", "undefined" }, .{ "let arr_i8 = new Int8Array([-10, -20, -30]);", "undefined" },
.{ "p.int8(arr_i8)", "undefined" }, .{ "p.int8(arr_i8)", "undefined" },
.{ "arr_i8;", "-13,-23,-33" }, .{ "arr_i8;", "-13,-23,-33" },
@@ -325,6 +333,7 @@ test "JS: primitive types" {
.{ "try { p.intu64(arr_i64) } catch(e) { e instanceof TypeError; }", "true" }, .{ "try { p.intu64(arr_i64) } catch(e) { e instanceof TypeError; }", "true" },
.{ "try { p.intu64(arr_u32) } catch(e) { e instanceof TypeError; }", "true" }, .{ "try { p.intu64(arr_u32) } catch(e) { e instanceof TypeError; }", "true" },
.{ "p.returnEmptyUint8()", "" },
.{ "p.returnUint8()", "10,20,250" }, .{ "p.returnUint8()", "10,20,250" },
.{ "p.returnInt8()", "10,-20,-120" }, .{ "p.returnInt8()", "10,-20,-120" },
.{ "p.returnUint16()", "10,200,2050" }, .{ "p.returnUint16()", "10,200,2050" },