From 91c0ffd6cf1ffb6a86c3ce4d6365ab0843ad9c37 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Wed, 4 Mar 2020 14:47:26 -0700 Subject: [PATCH] Null check sway_layer_surface when checking damage Before this change, an overlay layer-shell surface without a buffer attached would segfault the compositor on screen damage. --- sway/desktop/output.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ec3d6424..e6ed9be0 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -388,6 +388,9 @@ bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { struct wlr_surface *wlr_surface = wlr_layer_surface_v1->surface; struct sway_layer_surface *sway_layer_surface = layer_from_wlr_layer_surface_v1(wlr_layer_surface_v1); + if (sway_layer_surface == NULL) { + continue; + } pixman_box32_t output_box = { .x2 = output->width, .y2 = output->height,