From bb2a98645b33751b3d62b45f2c27a88ace4eb62b Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Sun, 24 Apr 2022 22:24:47 +0100 Subject: [PATCH] layer: handle output_destroy.notify without crash Steps to reproduce crash: - run nested with two outputs (e.g. WLR_WL_OUTPUTS=2 ./build/labwc) - start panel on one output (e.g. waybar) - close that output Backtrace pointed to output_destroy_notify() at ../src/layers.c:92 Reported-by: @Consolatis --- src/layers.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/layers.c b/src/layers.c index d9e9afe9..9d18e23d 100644 --- a/src/layers.c +++ b/src/layers.c @@ -88,8 +88,7 @@ output_destroy_notify(struct wl_listener *listener, void *data) { struct lab_layer_surface *layer = wl_container_of(listener, layer, output_destroy); - wl_list_remove(&layer->output_destroy.link); - wlr_layer_surface_v1_destroy(layer->scene_layer_surface->layer_surface); + layer->scene_layer_surface->layer_surface->output = NULL; } static void @@ -322,6 +321,12 @@ new_layer_surface_notify(struct wl_listener *listener, void *data) surface->scene_layer_surface = wlr_scene_layer_surface_v1_create( &selected_layer->node, layer_surface); + if (!surface->scene_layer_surface) { + wlr_layer_surface_v1_destroy(layer_surface); + wlr_log(WLR_ERROR, "could not create layer surface"); + return; + } + node_descriptor_create(surface->scene_layer_surface->node, LAB_NODE_DESC_LAYER_SURFACE, surface);