mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: move some windows path checking logic

Browse Source
This commit is contained in:
Andrew Kelley 2025-10-18 07:38:10 -07:00
parent 2d7d98da0c
commit 21e195a1a9
4 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/fs/Dir.zig
View File

@ -1575,7 +1575,7 @@ pub fn symLink(
// when converting to an NT namespaced path. CreateSymbolicLink in // when converting to an NT namespaced path. CreateSymbolicLink in
// symLinkW will handle the necessary conversion. // symLinkW will handle the necessary conversion.
var target_path_w: windows.PathSpace = undefined; var target_path_w: windows.PathSpace = undefined;
try std.unicode.checkWtf8ToWtf16LeOverflow(target_path, &target_path_w.data); try windows.checkWtf8ToWtf16LeOverflow(target_path, &target_path_w.data);
target_path_w.len = try std.unicode.wtf8ToWtf16Le(&target_path_w.data, target_path); target_path_w.len = try std.unicode.wtf8ToWtf16Le(&target_path_w.data, target_path);
target_path_w.data[target_path_w.len] = 0; target_path_w.data[target_path_w.len] = 0;
// However, we need to canonicalize any path separators to `\`, since if // However, we need to canonicalize any path separators to `\`, since if

9
lib/std/os/windows.zig
View File

@ -5739,3 +5739,12 @@ pub fn ProcessBaseAddress(handle: HANDLE) ProcessBaseAddressError!HMODULE {
const ppeb: *const PEB = @ptrCast(@alignCast(peb_out.ptr)); const ppeb: *const PEB = @ptrCast(@alignCast(peb_out.ptr));
return ppeb.ImageBaseAddress; return ppeb.ImageBaseAddress;
} }
pub fn checkWtf8ToWtf16LeOverflow(wtf8: []const u8, wtf16le: []const u16) error{ BadPathName, NameTooLong }!void {
// Each u8 in UTF-8/WTF-8 correlates to at most one u16 in UTF-16LE/WTF-16LE.
if (wtf16le.len >= wtf8.len) return;
const utf16_len = std.unicode.calcUtf16LeLenImpl(wtf8, .can_encode_surrogate_half) catch
return error.BadPathName;
if (utf16_len > wtf16le.len)
return error.NameTooLong;
}

4
lib/std/posix.zig
View File

@ -2918,7 +2918,7 @@ pub fn chdir(dir_path: []const u8) ChangeCurDirError!void {
@compileError("WASI does not support os.chdir"); @compileError("WASI does not support os.chdir");
} else if (native_os == .windows) { } else if (native_os == .windows) {
var wtf16_dir_path: [windows.PATH_MAX_WIDE]u16 = undefined; var wtf16_dir_path: [windows.PATH_MAX_WIDE]u16 = undefined;
try std.unicode.checkWtf8ToWtf16LeOverflow(dir_path, &wtf16_dir_path); try windows.checkWtf8ToWtf16LeOverflow(dir_path, &wtf16_dir_path);
const len = try std.unicode.wtf8ToWtf16Le(&wtf16_dir_path, dir_path); const len = try std.unicode.wtf8ToWtf16Le(&wtf16_dir_path, dir_path);
return chdirW(wtf16_dir_path[0..len]); return chdirW(wtf16_dir_path[0..len]);
} else { } else {
@ -2935,7 +2935,7 @@ pub fn chdirZ(dir_path: [*:0]const u8) ChangeCurDirError!void {
if (native_os == .windows) { if (native_os == .windows) {
const dir_path_span = mem.span(dir_path); const dir_path_span = mem.span(dir_path);
var wtf16_dir_path: [windows.PATH_MAX_WIDE]u16 = undefined; var wtf16_dir_path: [windows.PATH_MAX_WIDE]u16 = undefined;
try std.unicode.checkWtf8ToWtf16LeOverflow(dir_path_span, &wtf16_dir_path); try windows.checkWtf8ToWtf16LeOverflow(dir_path_span, &wtf16_dir_path);
const len = try std.unicode.wtf8ToWtf16Le(&wtf16_dir_path, dir_path_span); const len = try std.unicode.wtf8ToWtf16Le(&wtf16_dir_path, dir_path_span);
return chdirW(wtf16_dir_path[0..len]); return chdirW(wtf16_dir_path[0..len]);
} else if (native_os == .wasi and !builtin.link_libc) { } else if (native_os == .wasi and !builtin.link_libc) {

26
lib/std/unicode.zig
View File

@ -1809,31 +1809,6 @@ pub fn wtf8ToWtf16Le(wtf16le: []u16, wtf8: []const u8) error{InvalidWtf8}!usize
return utf8ToUtf16LeImpl(wtf16le, wtf8, .can_encode_surrogate_half); return utf8ToUtf16LeImpl(wtf16le, wtf8, .can_encode_surrogate_half);
} }
fn checkUtf8ToUtf16LeOverflowImpl(utf8: []const u8, utf16le: []const u16, comptime surrogates: Surrogates) !void {
// Each u8 in UTF-8/WTF-8 correlates to at most one u16 in UTF-16LE/WTF-16LE.
if (utf16le.len >= utf8.len) return;
const utf16_len = calcUtf16LeLenImpl(utf8, surrogates) catch {
return switch (surrogates) {
.cannot_encode_surrogate_half => error.InvalidUtf8,
.can_encode_surrogate_half => error.InvalidWtf8,
};
};
if (utf16_len > utf16le.len)
return error.NameTooLong;
}
/// Checks if calling `utf8ToUtf16Le` would overflow. Might fail if utf8 is not
/// valid UTF-8.
pub fn checkUtf8ToUtf16LeOverflow(utf8: []const u8, utf16le: []const u16) error{ InvalidUtf8, NameTooLong }!void {
return checkUtf8ToUtf16LeOverflowImpl(utf8, utf16le, .cannot_encode_surrogate_half);
}
/// Checks if calling `utf8ToUtf16Le` would overflow. Might fail if wtf8 is not
/// valid WTF-8.
pub fn checkWtf8ToWtf16LeOverflow(wtf8: []const u8, wtf16le: []const u16) error{ InvalidWtf8, NameTooLong }!void {
return checkUtf8ToUtf16LeOverflowImpl(wtf8, wtf16le, .can_encode_surrogate_half);
}
/// Surrogate codepoints (U+D800 to U+DFFF) are replaced by the Unicode replacement /// Surrogate codepoints (U+D800 to U+DFFF) are replaced by the Unicode replacement
/// character (U+FFFD). /// character (U+FFFD).
/// All surrogate codepoints and the replacement character are encoded as three /// All surrogate codepoints and the replacement character are encoded as three
@ -2040,7 +2015,6 @@ fn testRoundtripWtf8(wtf8: []const u8) !void {
var wtf16_buf: [32]u16 = undefined; var wtf16_buf: [32]u16 = undefined;
const wtf16_len = try wtf8ToWtf16Le(&wtf16_buf, wtf8); const wtf16_len = try wtf8ToWtf16Le(&wtf16_buf, wtf8);
try testing.expectEqual(wtf16_len, calcWtf16LeLen(wtf8)); try testing.expectEqual(wtf16_len, calcWtf16LeLen(wtf8));
try checkWtf8ToWtf16LeOverflow(wtf8, &wtf16_buf);
const wtf16 = wtf16_buf[0..wtf16_len]; const wtf16 = wtf16_buf[0..wtf16_len];
var roundtripped_buf: [32]u8 = undefined; var roundtripped_buf: [32]u8 = undefined;