From 130bf15cfa13a927972556d65fa04b8e10c79e03 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 1 Oct 2018 14:45:17 +0200 Subject: [PATCH] Fix a crash on zxdg_decoration_manager_v1 destroy When this request was called from a client, the unimplemented callback was NULL and thus was crashing rootston. --- types/wlr_xdg_decoration_v1.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/types/wlr_xdg_decoration_v1.c b/types/wlr_xdg_decoration_v1.c index f5182daa6..607b75e42 100644 --- a/types/wlr_xdg_decoration_v1.c +++ b/types/wlr_xdg_decoration_v1.c @@ -156,6 +156,11 @@ static struct wlr_xdg_decoration_manager_v1 * return wl_resource_get_user_data(resource); } +static void decoration_manager_handle_destroy( + struct wl_client *client, struct wl_resource *manager_resource) { + wl_resource_destroy(manager_resource); +} + static void decoration_manager_handle_get_toplevel_decoration( struct wl_client *client, struct wl_resource *manager_resource, uint32_t id, struct wl_resource *toplevel_resource) { @@ -229,6 +234,7 @@ static void decoration_manager_handle_get_toplevel_decoration( static const struct zxdg_decoration_manager_v1_interface decoration_manager_impl = { + .destroy = decoration_manager_handle_destroy, .get_toplevel_decoration = decoration_manager_handle_get_toplevel_decoration, };