compositor-wayland: destroy the appropriate output instead of exiting when receiving...

v2: Fix use after free spotted by Daniel Stone

Signed-off-by: Sergi Granell <xerpi.g.12@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 00cc4d47f894f259adf884b41e7e4fa68a2b0a8a..e2f416a38743c77bbc7d843f0cc848d90c54cea2 100644 (file)
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -1098,8 +1098,12 @@ static void
 handle_xdg_toplevel_close(void *data, struct zxdg_toplevel_v6 *xdg_toplevel)
 {
        struct wayland_output *output = data;
+       struct weston_compositor *compositor = output->base.compositor;
 
-       weston_compositor_exit(output->base.compositor);
+       wayland_output_destroy(&output->base);
+
+       if (wl_list_empty(&compositor->output_list))
+               weston_compositor_exit(compositor);
 }
 
 static const struct zxdg_toplevel_v6_listener xdg_toplevel_listener = {