From 9d827ef493ae71e614f07013e4df264423623eba Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Thu, 16 Jan 2020 21:26:15 -0500 Subject: [PATCH] output: apply oc to outputs using wl_for_each_safe If applying an output config to an output fails, the output may be destroyed. To be able to handle this situation correctly, apply_output_config_to_outputs needs to use wl_list_for_each_safe. --- sway/config/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/config/output.c b/sway/config/output.c index 8ea6c9f4..ec21b512 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -550,8 +550,8 @@ void apply_output_config_to_outputs(struct output_config *oc) { // will be applied during normal "new output" event from wlroots. bool wildcard = strcmp(oc->name, "*") == 0; char id[128]; - struct sway_output *sway_output; - wl_list_for_each(sway_output, &root->all_outputs, link) { + struct sway_output *sway_output, *tmp; + wl_list_for_each_safe(sway_output, tmp, &root->all_outputs, link) { char *name = sway_output->wlr_output->name; output_get_identifier(id, sizeof(id), sway_output); if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) {