Skip to content

std.fs.path: fix resolveWindows panic with relative drive paths #25709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

std.fs.path: fix resolveWindows panic with relative drive paths #25709

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5014c3
fix: windows path resolve
Cooksey99 Oct 26, 2025
1cb92e6
added tests
Cooksey99 Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions lib/std/fs/path.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,9 +489,11 @@ fn compareDiskDesignators(kind: WindowsPath.Kind, p1: []const u8, p2: []const u8
return true;
},
WindowsPath.Kind.Drive => {
if (p1.len == 0 or p2.len == 0) return false;
return ascii.toUpper(p1[0]) == ascii.toUpper(p2[0]);
},
WindowsPath.Kind.NetworkShare => {
if (p1.len == 0 or p2.len == 0) return false;
const sep1 = p1[0];
const sep2 = p2[0];

Expand Down Expand Up @@ -565,6 +567,8 @@ pub fn resolveWindows(allocator: Allocator, paths: []const []const u8) ![]u8 {
} else {
continue;
}
} else if (drive_kind != WindowsPath.Kind.None) {
correct_disk_designator = true;
}
if (!correct_disk_designator) {
continue;
Expand All @@ -581,13 +585,13 @@ pub fn resolveWindows(allocator: Allocator, paths: []const []const u8) ![]u8 {
defer result.deinit();

const disk_designator_len: usize = l: {
if (!have_abs_path) break :l 0;
switch (drive_kind) {
.Drive => {
try result.appendSlice(disk_designator);
break :l disk_designator.len;
},
.NetworkShare => {
if (!have_abs_path) break :l 0;
var it = mem.tokenizeAny(u8, paths[first_index], "/\\");
const server_name = it.next().?;
const other_name = it.next().?;
Expand All @@ -601,6 +605,7 @@ pub fn resolveWindows(allocator: Allocator, paths: []const []const u8) ![]u8 {
break :l result.items.len;
},
.None => {
if (!have_abs_path) break :l 0;
break :l 1;
},
}
Expand All @@ -614,8 +619,7 @@ pub fn resolveWindows(allocator: Allocator, paths: []const []const u8) ![]u8 {

if (parsed.kind != .None) {
if (parsed.kind == drive_kind) {
const dd = result.items[0..disk_designator_len];
correct_disk_designator = compareDiskDesignators(drive_kind, dd, parsed.disk_designator);
correct_disk_designator = compareDiskDesignators(drive_kind, disk_designator, parsed.disk_designator);
} else {
continue;
}
Expand Down Expand Up @@ -643,7 +647,7 @@ pub fn resolveWindows(allocator: Allocator, paths: []const []const u8) ![]u8 {
result.items.len -= 1;
if (end_with_sep or result.items.len == 0) break;
}
} else if (!have_abs_path and result.items.len == 0) {
} else if (!have_abs_path and result.items.len == disk_designator_len) {
try result.appendSlice(component);
} else {
try result.ensureUnusedCapacity(1 + component.len);
Expand Down Expand Up @@ -804,6 +808,15 @@ test resolveWindows {

// Keep relative paths relative.
try testResolveWindows(&[_][]const u8{"a/b"}, "a\\b");
// Drive-relative path as first argument.
try testResolveWindows(&[_][]const u8{ "c:foo", "bar" }, "C:foo\\bar");

try testResolveWindows(&[_][]const u8{ "c:foo", "c:\\bar" }, "C:\\bar");
try testResolveWindows(&[_][]const u8{ "c:/foo", "\\bar" }, "C:\\bar");
try testResolveWindows(&[_][]const u8{ "c:foo", "\\bar" }, "C:\\bar");
try testResolveWindows(&[_][]const u8{ "c:relative", "\\server", "relative" }, "C:\\server\\relative");
try testResolveWindows(&[_][]const u8{ "relative", "c:/absolute", "relative" }, "C:\\absolute\\relative");
try testResolveWindows(&[_][]const u8{ "relative", "c:/absolute", "//server" }, "C:\\absolute\\server");
}

test resolvePosix {
Expand Down