archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 02:44:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

windows: Remove BadPathName from error set of GetFinalPathNameByHandle

Browse source 
These validations are really only checking for kernel/mount manager
bugs, so an assert seems more appropriate.
This commit is contained in:
Ryan Liptak 2025-12-19 03:24:02 -08:00 • committed by Andrew Kelley
parent 07c4ea2de0
commit 1136d36362
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/std/os/windows.zig
View file

@ -3599,7 +3599,6 @@ test QueryObjectName {
pub const GetFinalPathNameByHandleError = error{
AccessDenied,
BadPathName,
FileNotFound,
NameTooLong,
/// The volume does not contain a recognized file system. File system
@ -3705,6 +3704,7 @@ pub fn GetFinalPathNameByHandle(
error.WouldBlock => return error.Unexpected,
error.NetworkNotFound => return error.Unexpected,
error.AntivirusInterference => return error.Unexpected,
error.BadPathName => return error.Unexpected,
else => |e| return e,
};
defer CloseHandle(mgmt_handle);
@ -3750,9 +3750,7 @@ pub fn GetFinalPathNameByHandle(
const total_len = drive_letter.len + file_name_u16.len;
// Validate that DOS does not contain any spurious nul bytes.
if (mem.findScalar(u16, out_buffer[0..total_len], 0)) |_| {
return error.BadPathName;
}
assert(mem.findScalar(u16, out_buffer[0..total_len], 0) == null);
return out_buffer[0..total_len];
} else if (mountmgrIsVolumeName(symlink)) {
@ -3802,9 +3800,7 @@ pub fn GetFinalPathNameByHandle(
const total_len = volume_path.len + file_name_u16.len;
// Validate that DOS does not contain any spurious nul bytes.
if (mem.findScalar(u16, out_buffer[0..total_len], 0)) |_| {
return error.BadPathName;
}
assert(mem.findScalar(u16, out_buffer[0..total_len], 0) == null);
return out_buffer[0..total_len];
}