From 2bc637ccff3a39ee85bfd3e28402a7c588dd63a4 Mon Sep 17 00:00:00 2001 From: Kai Tamkun Date: Fri, 31 Jan 2025 18:55:29 -0800 Subject: [PATCH] Move emptiness check to hasValidPort --- src/bun.js/webcore/response.zig | 2 +- src/url.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig index 3728a94c53..2a9d0d144b 100644 --- a/src/bun.js/webcore/response.zig +++ b/src/bun.js/webcore/response.zig @@ -2241,7 +2241,7 @@ pub const Fetch = struct { return globalObject.ERR_INVALID_ARG_TYPE(fetch_error_blank_url, .{}).throw(); } - if (url.port.len > 0 and !url.hasValidPort()) { + if (!url.hasValidPort()) { bun.default_allocator.free(url.href); return globalObject.throwInvalidArguments("Invalid port", .{}); } diff --git a/src/url.zig b/src/url.zig index 451060cfa1..b7dd858b66 100644 --- a/src/url.zig +++ b/src/url.zig @@ -140,7 +140,7 @@ pub const URL = struct { } pub fn hasValidPort(this: *const URL) bool { - return (this.getPort() orelse 0) > 0; + return this.port.len == 0 or (this.getPort() orelse 0) > 0; } pub fn isEmpty(this: *const URL) bool {