mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-20 19:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix xauth file name UB

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2025-10-18 16:18:05 +02:00
parent 1fbcb10110
commit 1c05664c85
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
readme.md
View File

@@ -41,7 +41,7 @@ It is recommended to add a rule for Ly as it currently does not ship one.
### FreeBSD ### FreeBSD
``` ```
# pkg install ca_root_nss libxcb git # pkg install ca_root_nss libxcb git xorg xauth
``` ```
## Packaging status ## Packaging status

12
src/auth.zig
View File

@@ -322,7 +322,7 @@ fn getXPid(display_num: u8) !i32 {
return std.fmt.parseInt(i32, std.mem.trim(u8, buffer[0..written], " "), 10); return std.fmt.parseInt(i32, std.mem.trim(u8, buffer[0..written], " "), 10);
} }
fn createXauthFile(pwd: []const u8) ![]const u8 { fn createXauthFile(pwd: []const u8, buffer: []u8) ![]const u8 {
var xauth_buf: [100]u8 = undefined; var xauth_buf: [100]u8 = undefined;
var xauth_dir: []const u8 = undefined; var xauth_dir: []const u8 = undefined;
const xdg_rt_dir = std.posix.getenv("XDG_RUNTIME_DIR"); const xdg_rt_dir = std.posix.getenv("XDG_RUNTIME_DIR");
@@ -364,8 +364,7 @@ fn createXauthFile(pwd: []const u8) ![]const u8 {
while (xauth_dir[i] == '/') i -= 1; while (xauth_dir[i] == '/') i -= 1;
const trimmed_xauth_dir = xauth_dir[0 .. i + 1]; const trimmed_xauth_dir = xauth_dir[0 .. i + 1];
var buf: [256]u8 = undefined; const xauthority: []u8 = try std.fmt.bufPrint(buffer, "{s}/{s}", .{ trimmed_xauth_dir, xauth_file });
const xauthority: []u8 = try std.fmt.bufPrint(&buf, "{s}/{s}", .{ trimmed_xauth_dir, xauth_file });
const file = try std.fs.createFileAbsolute(xauthority, .{}); const file = try std.fs.createFileAbsolute(xauthority, .{});
file.close(); file.close();
@@ -382,8 +381,8 @@ fn mcookie() [Md5.digest_length * 2]u8 {
return std.fmt.bytesToHex(&out, .lower); return std.fmt.bytesToHex(&out, .lower);
} }
fn xauth(log_file: *LogFile, allocator: std.mem.Allocator, display_name: []u8, shell: [*:0]const u8, home: []const u8, options: AuthOptions) !void { fn xauth(log_file: *LogFile, allocator: std.mem.Allocator, display_name: []u8, shell: [*:0]const u8, home: []const u8, xauth_buffer: []u8, options: AuthOptions) !void {
const xauthority = try createXauthFile(home); const xauthority = try createXauthFile(home, xauth_buffer);
try interop.setEnvironmentVariable(allocator, "XAUTHORITY", xauthority, true); try interop.setEnvironmentVariable(allocator, "XAUTHORITY", xauthority, true);
try interop.setEnvironmentVariable(allocator, "DISPLAY", display_name, true); try interop.setEnvironmentVariable(allocator, "DISPLAY", display_name, true);
@@ -408,6 +407,7 @@ fn xauth(log_file: *LogFile, allocator: std.mem.Allocator, display_name: []u8, s
fn executeX11Cmd(log_file: *LogFile, allocator: std.mem.Allocator, shell: []const u8, home: []const u8, options: AuthOptions, desktop_cmd: []const u8, vt: []const u8) !void { fn executeX11Cmd(log_file: *LogFile, allocator: std.mem.Allocator, shell: []const u8, home: []const u8, options: AuthOptions, desktop_cmd: []const u8, vt: []const u8) !void {
var log_writer = &log_file.file_writer.interface; var log_writer = &log_file.file_writer.interface;
var xauth_buffer: [256]u8 = undefined;
try log_writer.writeAll("[x11] getting free display\n"); try log_writer.writeAll("[x11] getting free display\n");
const display_num = try getFreeDisplay(); const display_num = try getFreeDisplay();
@@ -418,7 +418,7 @@ fn executeX11Cmd(log_file: *LogFile, allocator: std.mem.Allocator, shell: []cons
defer allocator.free(shell_z); defer allocator.free(shell_z);
try log_writer.writeAll("[x11] creating xauth file\n"); try log_writer.writeAll("[x11] creating xauth file\n");
try xauth(log_file, allocator, display_name, shell_z, home, options); try xauth(log_file, allocator, display_name, shell_z, home, &xauth_buffer, options);
try log_writer.writeAll("[x11] starting x server\n"); try log_writer.writeAll("[x11] starting x server\n");
const pid = try std.posix.fork(); const pid = try std.posix.fork();