From 0edd8d262da4409f1e5566c47bfed9b3f23636b7 Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Sun, 19 Mar 2023 20:58:16 -0700 Subject: Fix bug with scoped aliased dependencies in bun install on macOS --- src/string_immutable.zig | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/string_immutable.zig') diff --git a/src/string_immutable.zig b/src/string_immutable.zig index 8f3859a34..d393577fc 100644 --- a/src/string_immutable.zig +++ b/src/string_immutable.zig @@ -3187,6 +3187,18 @@ test "indexOfNeedsEscape" { try std.testing.expectEqual(out.?, 48); } +pub fn indexOfCharZ(sliceZ: [:0]const u8, char: u8) ?u63 { + const ptr = bun.C.strchr(sliceZ.ptr, char) orelse return null; + const pos = @ptrToInt(ptr) - @ptrToInt(sliceZ.ptr); + + if (comptime Environment.allow_assert) + std.debug.assert(@ptrToInt(sliceZ.ptr) >= @ptrToInt(ptr) and + @ptrToInt(ptr) < @ptrToInt(sliceZ.ptr + sliceZ.len) and + pos <= sliceZ.len); + + return @truncate(u63, pos); +} + pub fn indexOfChar(slice: []const u8, char: u8) ?u32 { var remaining = slice; if (remaining.len == 0) -- cgit v1.2.3