sway

commit 8fd3f32c79c4784d846e05f5d9b4f284cd10ae2e
parent 14cab7861294189f820e0830ae84ac7b15271342
Author: Brian Ashworth <bosrsf04@gmail.com>
Date:   Thu, 10 Jan 2019 03:07:36 -0500

Fix segfaults on output destruction

This fixes two causes of segfaulting when an output is destroyed.

The first occurred when an output was never enabled. The issue was that
the destroy signal was never initialized so when it was emitted, sway
segfaulted. This was fixed by moving the initialization into
`output_create` since all outputs, regardless of whether they have ever
been enabled, will be destroyed at some point.

The second occurred when the cursor was on an output that was being
destroyed. The sway output would have already been removed, but if there
are other outputs, a cursor rebase would still occur. Since the
wlr_output still existed and the sway output was destroyed, the cursor
could be over nothing, resulting in a segfault when trying to get the
sway output, which was destroyed.

Diffstat:
M
sway/input/cursor.c
 | 
4
++++
M
sway/tree/output.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
@@ -85,6 +85,10 @@ static struct sway_node *node_at_coords(
 		return NULL;
 	}
 	struct sway_output *output = wlr_output->data;
+	if (!output) {
+		// output is being destroyed
+		return NULL;
+	}
 	double ox = lx, oy = ly;
 	wlr_output_layout_output_coords(root->output_layout, wlr_output, &ox, &oy);
 
diff --git a/sway/tree/output.c b/sway/tree/output.c
@@ -58,6 +58,7 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
 	wlr_output->data = output;
 
 	wl_signal_add(&wlr_output->events.destroy, &output->destroy);
+	wl_signal_init(&output->events.destroy);
 
 	wl_list_insert(&root->all_outputs, &output->link);
 
@@ -76,7 +77,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
 	for (size_t i = 0; i < len; ++i) {
 		wl_list_init(&output->layers[i]);
 	}
-	wl_signal_init(&output->events.destroy);
 
 	output->enabled = true;
 	list_add(root->outputs, output);