mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

output_get_active_workspace: check workspaces length

Browse source 
If an output's node was dirty and the transaction was committed before a
workspace was moved to or created for the output, the instruction would
have a bad value for `state->active_workspace` due to a missing
length check in `output_get_active_workspace`. If there was no focus on
the output, the first workspace was being returned. If the workspace
list was currently empty, the value was either garbage, or in the case of
an output being disabled and re-enabled, a workspace that may have been
previously freed. This just adds the length check to avoid returning out
of bounds value.
This commit is contained in:
Brian Ashworth 2019-02-21 08:06:35 -05:00
parent 546b976baa
commit 03dfdb1edb
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/desktop/output.c
View file

@ -320,6 +320,9 @@ struct sway_workspace *output_get_active_workspace(struct sway_output *output) {
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node); struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node);
if (!focus) { if (!focus) {
if (!output->workspaces->length) {
return NULL;
}
return output->workspaces->items[0]; return output->workspaces->items[0];
} }
return focus->sway_workspace; return focus->sway_workspace;