diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-10 03:07:36 -0500 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-10 03:07:36 -0500 |
commit | 8fd3f32c79c4784d846e05f5d9b4f284cd10ae2e (patch) | |
tree | e15d1e5a343750dc48c1055e55472641b5fda487 /sway/input | |
parent | 14cab7861294189f820e0830ae84ac7b15271342 (diff) |
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 (limited to 'sway/input')
-rw-r--r-- | sway/input/cursor.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 96feb47d..8f44eeae 100644 --- 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); |