aboutsummaryrefslogtreecommitdiff
path: root/src/url.zig
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-11-22 21:25:26 -0800
committerGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-11-22 21:25:26 -0800
commit4f41c3fb40a7cd23a48c1a888353059a69693fa8 (patch)
tree03d543e4471514c4e87ffbc371d5c60015339793 /src/url.zig
parentb249ed7257777f2d9b5fe18ba09694d75f0d0a90 (diff)
downloadbun-4f41c3fb40a7cd23a48c1a888353059a69693fa8.tar.gz
bun-4f41c3fb40a7cd23a48c1a888353059a69693fa8.tar.zst
bun-4f41c3fb40a7cd23a48c1a888353059a69693fa8.zip
[FileSystemRouter] Fix failing tests
Diffstat (limited to 'src/url.zig')
-rw-r--r--src/url.zig13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/url.zig b/src/url.zig
index 97ef74125..26c606a4d 100644
--- a/src/url.zig
+++ b/src/url.zig
@@ -859,15 +859,14 @@ pub const CombinedScanner = struct {
fn stringPointerFromStrings(parent: string, in: string) Api.StringPointer {
if (in.len == 0 or parent.len == 0) return Api.StringPointer{};
- if (bun.isSliceInBuffer(in, parent)) {
- const offset = @minimum(
- @maximum(@ptrToInt(in.ptr), @ptrToInt(parent.ptr)) - @minimum(@ptrToInt(in.ptr), @ptrToInt(parent.ptr)),
- @minimum(in.len, parent.len),
- );
-
- return Api.StringPointer{ .offset = @truncate(u32, offset), .length = @truncate(u32, in.len) };
+ if (bun.rangeOfSliceInBuffer(in, parent)) |range| {
+ return Api.StringPointer{ .offset = range[0], .length = range[1] };
} else {
if (strings.indexOf(parent, in)) |i| {
+ if (comptime Environment.allow_assert) {
+ std.debug.assert(strings.eqlLong(parent[i..][0..in.len], in, false));
+ }
+
return Api.StringPointer{
.offset = @truncate(u32, i),
.length = @truncate(u32, in.len),