xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit ba644a64a415962956de72936d21b6527ee8cd57
Author: Minh Phan <phanquangminh217 at gmail.com>
Date:   Sun Feb 5 14:38:32 2023 +0700

    xwayland/window: Do not double add window to damage list
    
    The window might be retained in the damage list after
    `xwl_screen_post_damage` in certain conditions. This means we need to
    check if the window is already in the list to avoid adding the same
    window twice which will lead to list corruption resulting in server freeze
    in `xwl_screen_post_damage`.
    
    Signed-off-by: Minh Phan <phanquangminh217 at gmail.com>

diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index d254eab4c..4363730fd 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -179,7 +179,8 @@ damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
     }
 #endif
 
-    xorg_list_add(&xwl_window->link_damage, &xwl_screen->damage_window_list);
+    if (xorg_list_is_empty(&xwl_window->link_damage))
+        xorg_list_add(&xwl_window->link_damage, &xwl_screen->damage_window_list);
 }
 
 static void