mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-17 22:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle utf16-encoded strings

Browse Source
This commit is contained in:
Don Isaac
2024-12-18 16:55:28 -08:00
parent 6d1d3d689b
commit 45eaa5c81a
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/bun.js/node/node_util_binding.zig
View File

@@ -123,6 +123,7 @@ pub fn extractedSplitNewLinesFastPathStringsOnly(globalThis: *JSC.JSGlobalObject
const str = try value.toBunString2(globalThis);
// if (str.isUTF16()) return JSC.JSValue.jsUndefined();
if (str.is8Bit() or bun.strings.isAllASCII(str.byteSlice())) {
var lines: std.ArrayListUnmanaged(bun.String) = .{};
defer {
@@ -137,12 +138,33 @@ pub fn extractedSplitNewLinesFastPathStringsOnly(globalThis: *JSC.JSGlobalObject
while (std.mem.indexOfScalarPos(u8, bytes, start, '\n')) |delim_start| {
const end = delim_start + 1;
try lines.append(allocator, bun.String.fromBytes(bytes[start..end])); // include the newline
const buf = bytes[start..end];
const s = switch (str.encoding()) {
.latin1 => bun.String.fromBytes(buf),
.utf8 => bun.String.fromUTF8(buf),
.utf16 => blk: {
var _s = bun.String.fromBytes(buf);
_s.value.ZigString.markUTF16();
break :blk _s;
},
// bun.String.fromUTF16(@ptrCast(buf)),
};
try lines.append(allocator, s); // include the newline
start = end;
}
if (start < bytes.len) {
try lines.append(allocator, bun.String.fromBytes(bytes[start..]));
const buf = bytes[start..];
const s = switch (str.encoding()) {
.latin1 => bun.String.fromBytes(buf),
.utf8 => bun.String.fromUTF8(buf),
.utf16 => blk: {
var _s = bun.String.fromBytes(buf);
_s.value.ZigString.markUTF16();
break :blk _s;
},
};
try lines.append(allocator, s);
}
return bun.String.toJSArray(globalThis, lines.items);