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

fix bugs found by exception scope verification (#20285)

Browse Source 
Co-authored-by: 190n <7763597+190n@users.noreply.github.com>
This commit is contained in:
190n
2025-06-18 23:08:19 -07:00
committed by GitHub
parent aa37ecb7a5
commit 346e97dde2
98 changed files with 4263 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/string.zig
View File

@@ -514,18 +514,22 @@ pub const String = extern struct {
}
pub fn fromJS(value: bun.JSC.JSValue, globalObject: *JSC.JSGlobalObject) bun.JSError!String {
var scope: JSC.CatchScope = undefined;
scope.init(globalObject, @src(), .assertions_only);
defer scope.deinit();
var out: String = String.dead;
if (BunString__fromJS(globalObject, value, &out)) {
if (comptime bun.Environment.isDebug) {
bun.assert(out.tag != .Dead);
}
return out;
const ok = BunString__fromJS(globalObject, value, &out);
// If there is a pending exception, but stringifying succeeds, we don't return JSError.
// We do need to always call hasException() to satisfy the need for an exception check.
const has_exception = scope.hasException();
if (ok) {
bun.debugAssert(out.tag != .Dead);
} else {
bun.debugAssert(has_exception);
}
if (comptime bun.Environment.isDebug) {
bun.assert(globalObject.hasException());
}
return error.JSError;
return if (ok) out else error.JSError;
}
pub fn toJS(this: *const String, globalObject: *bun.JSC.JSGlobalObject) JSC.JSValue {
@@ -549,7 +553,7 @@ pub const String = extern struct {
/// calls toJS on all elements of `array`.
pub fn toJSArray(globalObject: *bun.JSC.JSGlobalObject, array: []const bun.String) bun.JSError!JSC.JSValue {
JSC.markBinding(@src());
return bun.jsc.fromJSHostValue(BunString__createArray(globalObject, array.ptr, array.len));
return bun.jsc.fromJSHostCall(globalObject, @src(), BunString__createArray, .{ globalObject, array.ptr, array.len });
}
pub fn toZigString(this: String) ZigString {