public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-04-01 18:06:46 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix typo in variable name

Browse Source 
protect against overflow if path stats with ':'

Minor tweaks to https://github.com/lightpanda-io/browser/pull/2046
This commit is contained in:
Karl Seguin
2026-04-01 19:20:55 +08:00
parent 2d87f5bf47
commit 7fcaa500d8
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/browser/URL.zig
View File

@@ -41,14 +41,14 @@ pub fn resolve(allocator: Allocator, base: [:0]const u8, source_path: anytype, c
const scheme_path = path[0..scheme_path_end]; const scheme_path = path[0..scheme_path_end];
//from "ws" to "https" //from "ws" to "https"
if (scheme_path_end >= 2 and scheme_path_end <= 5) { if (scheme_path_end >= 2 and scheme_path_end <= 5) {
const has_double_slashas: bool = scheme_path_end + 3 <= path.len and path[scheme_path_end + 1] == '/' and path[scheme_path_end + 2] == '/'; const has_double_slashes: bool = scheme_path_end + 3 <= path.len and path[scheme_path_end + 1] == '/' and path[scheme_path_end + 2] == '/';
const special_schemes = [_][]const u8{ "https", "http", "ws", "wss", "file", "ftp" }; const special_schemes = [_][]const u8{ "https", "http", "ws", "wss", "file", "ftp" };
for (special_schemes) |special_scheme| { for (special_schemes) |special_scheme| {
if (std.ascii.eqlIgnoreCase(scheme_path, special_scheme)) { if (std.ascii.eqlIgnoreCase(scheme_path, special_scheme)) {
const base_scheme_end = std.mem.indexOf(u8, base, "://") orelse 0; const base_scheme_end = std.mem.indexOf(u8, base, "://") orelse 0;
if (base_scheme_end > 0 and std.mem.eql(u8, base[0..base_scheme_end], scheme_path) and !has_double_slashas) { if (base_scheme_end > 0 and std.mem.eql(u8, base[0..base_scheme_end], scheme_path) and !has_double_slashes) {
//Skip ":" and exit as relative state //Skip ":" and exit as relative state
path = path[scheme_path_end + 1 ..]; path = path[scheme_path_end + 1 ..];
break :scheme_check; break :scheme_check;
@@ -58,12 +58,12 @@ pub fn resolve(allocator: Allocator, base: [:0]const u8, source_path: anytype, c
while (rest_start < path.len and (path[rest_start] == '/' or path[rest_start] == '\\')) { while (rest_start < path.len and (path[rest_start] == '/' or path[rest_start] == '\\')) {
rest_start += 1; rest_start += 1;
} }
// A special scheme (exclude "file") must contain at least anu chars after "://" // A special scheme (exclude "file") must contain at least any chars after "://"
if (rest_start == path.len and !std.ascii.eqlIgnoreCase(scheme_path, "file")) { if (rest_start == path.len and !std.ascii.eqlIgnoreCase(scheme_path, "file")) {
return error.TypeError; return error.TypeError;
} }
//File scheme allow empty host //File scheme allow empty host
const separator: []const u8 = if (!has_double_slashas and std.ascii.eqlIgnoreCase(scheme_path, "file")) ":///" else "://"; const separator: []const u8 = if (!has_double_slashes and std.ascii.eqlIgnoreCase(scheme_path, "file")) ":///" else "://";
path = try std.mem.joinZ(allocator, "", &.{ scheme_path, separator, path[rest_start..] }); path = try std.mem.joinZ(allocator, "", &.{ scheme_path, separator, path[rest_start..] });
return processResolved(allocator, path, opts); return processResolved(allocator, path, opts);
@@ -71,12 +71,14 @@ pub fn resolve(allocator: Allocator, base: [:0]const u8, source_path: anytype, c
} }
} }
} }
if (scheme_path.len > 0) {
for (scheme_path[1..]) |c| { for (scheme_path[1..]) |c| {
if (!std.ascii.isAlphanumeric(c) and c != '+' and c != '-' and c != '.') { if (!std.ascii.isAlphanumeric(c) and c != '+' and c != '-' and c != '.') {
//Exit as relative state //Exit as relative state
break :scheme_check; break :scheme_check;
} }
} }
}
//path is complete http url //path is complete http url
return processResolved(allocator, path, opts); return processResolved(allocator, path, opts);
} }