alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix crash when disconnecting output

Browse source 
We were freeing the sway_output immediately upon disconnect which left
a dangling pointer in the output's container. It then tried to use the
pointer when the container is freed.

We don't need to store the sway_output in an output's container which is
destroying, so the fix is to set the pointer to NULL and remove the use
in container_free.

Also added an arrange when the output is disconnected for good measure.
This commit is contained in:
Ryan Dwyer 2018-06-26 19:40:42 +10:00
parent 0085f64ac0
commit 834805f5e2
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/desktop/output.c
View file

@ -1271,6 +1271,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&output->destroy.link); wl_list_remove(&output->destroy.link);
output->wlr_output->data = NULL; output->wlr_output->data = NULL;
free(output); free(output);
arrange_and_commit(&root_container);
} }
static void handle_mode(struct wl_listener *listener, void *data) { static void handle_mode(struct wl_listener *listener, void *data) {

2
sway/tree/container.c
View file

@ -171,7 +171,6 @@ void container_free(struct sway_container *cont) {
case C_ROOT: case C_ROOT:
break; break;
case C_OUTPUT: case C_OUTPUT:
cont->sway_output->swayc = NULL;
break; break;
case C_WORKSPACE: case C_WORKSPACE:
container_workspace_free(cont->sway_workspace); container_workspace_free(cont->sway_workspace);
@ -287,6 +286,7 @@ static struct sway_container *container_output_destroy(
wl_list_remove(&output->sway_output->damage_frame.link); wl_list_remove(&output->sway_output->damage_frame.link);
output->sway_output->swayc = NULL; output->sway_output->swayc = NULL;
output->sway_output = NULL;
wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);