xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-output.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6f63873da55de33e51c1f6849a65501e380f19bc
Author: Simon Ser <contact at emersion.fr>
Date:   Mon Jul 5 15:30:16 2021 +0200

    xwayland: fix xdg_output leak
    
    The xdg_output wasn't cleaned up when destroying the xwl_output.
    
    Signed-off-by: Simon Ser <contact at emersion.fr>

diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 52c505057..ef705bc01 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -701,6 +701,8 @@ err:
 void
 xwl_output_destroy(struct xwl_output *xwl_output)
 {
+    if (xwl_output->xdg_output)
+        zxdg_output_v1_destroy(xwl_output->xdg_output);
     wl_output_destroy(xwl_output->output);
     free(xwl_output);
 }