diff options
| author |  Dylan Conway <dylan.conway567@gmail.com>
| 2023-01-27 20:41:15 -0800 |
|---|---|---|
| committer | Dylan Conway <dylan.conway567@gmail.com>
| 2023-01-27 20:41:15 -0800 |
| commit | d90a00857ba69c42afe7bee06fef6738a29b26bd (patch) | |
| tree | ecabe32c53065e39858c5099af6ed4f5e443ba59 | |
| parent | 5ab2c8e4d6d00595d128dd2f2ee28013217574b4 (diff) | |
| download | bun-d90a00857ba69c42afe7bee06fef6738a29b26bd.tar.gz bun-d90a00857ba69c42afe7bee06fef6738a29b26bd.tar.zst bun-d90a00857ba69c42afe7bee06fef6738a29b26bd.zip | |
fix sentinel mismatches
| -rw-r--r-- | src/bun.js/api/ffi.zig | 2 | ||||
| -rw-r--r-- | src/resolver/resolve_path.zig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig index a6c4c8b8c..2e493cebe 100644 --- a/src/bun.js/api/ffi.zig +++ b/src/bun.js/api/ffi.zig @@ -290,7 +290,7 @@ pub const FFI = struct { return JSC.toInvalidArguments("Expected an options object with symbol names", .{}, global); } - const name = name_slice.sliceZ(); + const name = name_slice.slice(); var symbols = bun.StringArrayHashMapUnmanaged(Function){}; if (generateSymbols(global, &symbols, object) catch JSC.JSValue.zero) |val| { // an error while validating symbols diff --git a/src/resolver/resolve_path.zig b/src/resolver/resolve_path.zig index 4db102f59..20f889c2c 100644 --- a/src/resolver/resolve_path.zig +++ b/src/resolver/resolve_path.zig @@ -788,7 +788,7 @@ inline fn _joinAbsStringBuf(comptime is_sentinel: bool, comptime ReturnType: typ std.mem.copy(u8, buf[0..leading_separator.len], leading_separator); if (comptime is_sentinel) { - buf.ptr[result.len + leading_separator.len + 1] = 0; + buf.ptr[result.len + leading_separator.len] = 0; return buf[0 .. result.len + leading_separator.len :0]; } else { return buf[0 .. result.len + leading_separator.len]; |