aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js/api/bun.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/bun.js/api/bun.zig')
-rw-r--r--src/bun.js/api/bun.zig154
1 files changed, 77 insertions, 77 deletions
diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig
index 9ddf309cc..105add52c 100644
--- a/src/bun.js/api/bun.zig
+++ b/src/bun.js/api/bun.zig
@@ -1542,95 +1542,95 @@ pub fn serve(
unreachable;
}
-pub export fn Bun__escapeHTML(
- globalObject: *JSGlobalObject,
- callframe: *JSC.CallFrame,
-) JSC.JSValue {
- const arguments = callframe.arguments(2);
- if (arguments.len < 1) {
- return ZigString.Empty.toValue(globalObject);
+pub export fn Bun__escapeHTML16(globalObject: *JSC.JSGlobalObject, input_value: JSValue, ptr: [*]const u16, len: usize) JSValue {
+ std.debug.assert(len > 0);
+ const input_slice = ptr[0..len];
+ const escaped = strings.escapeHTMLForUTF16Input(globalObject.bunVM().allocator, input_slice) catch {
+ globalObject.vm().throwError(globalObject, ZigString.init("Out of memory").toValue(globalObject));
+ return JSC.JSValue.jsUndefined();
+ };
+
+ switch (escaped) {
+ .static => |val| {
+ return ZigString.init(val).toValue(globalObject);
+ },
+ .original => return input_value,
+ .allocated => |escaped_html| {
+ if (comptime Environment.allow_assert) {
+ // assert that re-encoding the string produces the same result
+ std.debug.assert(
+ std.mem.eql(
+ u16,
+ (strings.toUTF16Alloc(bun.default_allocator, strings.toUTF8Alloc(bun.default_allocator, escaped_html) catch unreachable, false) catch unreachable).?,
+ escaped_html,
+ ),
+ );
+
+ // assert we do not allocate a new string unnecessarily
+ std.debug.assert(
+ !std.mem.eql(
+ u16,
+ input_slice,
+ escaped_html,
+ ),
+ );
+
+ // the output should always be longer than the input
+ std.debug.assert(escaped_html.len > input_slice.len);
+ }
+
+ return ZigString.from16(escaped_html.ptr, escaped_html.len).toExternalValue(globalObject);
+ },
}
+}
- const input_value = arguments.ptr[0];
- const zig_str = input_value.getZigString(globalObject);
- if (zig_str.len == 0)
- return ZigString.Empty.toValue(globalObject);
+pub export fn Bun__escapeHTML8(globalObject: *JSC.JSGlobalObject, input_value: JSValue, ptr: [*]const u8, len: usize) JSValue {
+ std.debug.assert(len > 0);
- if (zig_str.is16Bit()) {
- const input_slice = zig_str.utf16SliceAligned();
- const escaped = strings.escapeHTMLForUTF16Input(globalObject.bunVM().allocator, input_slice) catch {
- globalObject.vm().throwError(globalObject, ZigString.init("Out of memory").toValue(globalObject));
- return JSC.JSValue.jsUndefined();
- };
+ const input_slice = ptr[0..len];
+ var stack_allocator = std.heap.stackFallback(256, globalObject.bunVM().allocator);
+ const allocator = if (input_slice.len <= 32) stack_allocator.get() else stack_allocator.fallback_allocator;
- switch (escaped) {
- .static => |val| {
- return ZigString.init(val).toValue(globalObject);
- },
- .original => return input_value,
- .allocated => |escaped_html| {
- if (comptime Environment.allow_assert) {
- // assert that re-encoding the string produces the same result
- std.debug.assert(
- std.mem.eql(
- u16,
- (strings.toUTF16Alloc(bun.default_allocator, strings.toUTF8Alloc(bun.default_allocator, escaped_html) catch unreachable, false) catch unreachable).?,
- escaped_html,
- ),
- );
-
- // assert we do not allocate a new string unnecessarily
- std.debug.assert(
- !std.mem.eql(
- u16,
- input_slice,
- escaped_html,
- ),
- );
-
- // the output should always be longer than the input
- std.debug.assert(escaped_html.len > input_slice.len);
- }
+ const escaped = strings.escapeHTMLForLatin1Input(allocator, input_slice) catch {
+ globalObject.vm().throwError(globalObject, ZigString.init("Out of memory").toValue(globalObject));
+ return JSC.JSValue.jsUndefined();
+ };
- return ZigString.from16(escaped_html.ptr, escaped_html.len).toExternalValue(globalObject);
- },
- }
- } else {
- const input_slice = zig_str.slice();
- const escaped = strings.escapeHTMLForLatin1Input(globalObject.bunVM().allocator, input_slice) catch {
- globalObject.vm().throwError(globalObject, ZigString.init("Out of memory").toValue(globalObject));
- return JSC.JSValue.jsUndefined();
- };
+ switch (escaped) {
+ .static => |val| {
+ return ZigString.init(val).toValue(globalObject);
+ },
+ .original => return input_value,
+ .allocated => |escaped_html| {
+ if (comptime Environment.allow_assert) {
+ // the output should always be longer than the input
+ std.debug.assert(escaped_html.len > input_slice.len);
+
+ // assert we do not allocate a new string unnecessarily
+ std.debug.assert(
+ !std.mem.eql(
+ u8,
+ input_slice,
+ escaped_html,
+ ),
+ );
+ }
- switch (escaped) {
- .static => |val| {
- return ZigString.init(val).toValue(globalObject);
- },
- .original => return input_value,
- .allocated => |escaped_html| {
- if (comptime Environment.allow_assert) {
- // the output should always be longer than the input
- std.debug.assert(escaped_html.len > input_slice.len);
-
- // assert we do not allocate a new string unnecessarily
- std.debug.assert(
- !std.mem.eql(
- u8,
- input_slice,
- escaped_html,
- ),
- );
- }
+ if (input_slice.len <= 32) {
+ const zig_str = ZigString.init(escaped_html);
+ const out = zig_str.toAtomicValue(globalObject);
+ return out;
+ }
- return ZigString.init(escaped_html).toExternalValue(globalObject);
- },
- }
+ return ZigString.init(escaped_html).toExternalValue(globalObject);
+ },
}
}
comptime {
if (!JSC.is_bindgen) {
- _ = Bun__escapeHTML;
+ _ = Bun__escapeHTML8;
+ _ = Bun__escapeHTML16;
}
}