Fix use-after-free by moving config-reload into the manage cycle

This commit is contained in:
Ben Buhse 2026-01-31 14:08:46 -06:00
commit 4157dd67f6
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
3 changed files with 33 additions and 14 deletions

View file

@ -186,9 +186,12 @@ fn manage_start(wm: *WindowManager) void {
const river_window_manager_v1 = wm.river_window_manager_v1;
const context = wm.context;
// This gets used shortly, so it goes at the beginning
context.manage();
if (!context.initialized) {
// This code (should) only be run once while initializing the WM, so let's
// mark it as cold.
// This code runs during initial startup and after config reloads.
@branchHint(.cold);
context.initialized = true;
@ -220,7 +223,7 @@ fn manage_start(wm: *WindowManager) void {
}
}
// Manage the WM itself first
// Manage the WM itself before outputs/windows/seats
if (wm.pending_manage.primary_ratio) |primary_ratio| {
// Ratios outside of this range can cause crashes anyways (when doing the layout calulcation)
std.debug.assert(primary_ratio >= 0.10 and primary_ratio <= 0.90);