xserver: Branch 'master'

[GitLab Mirror]

 dix/enterleave.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bca68f41b222ca7bf881f0e2d7011e9fea43c60
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Mar 20 11:24:32 2025 +1000

    dix: fix erroneous BUG_RETURN check
    
    Check was inverted, we want to complain if evcount exceeds our target
    array.
    
    Fixes: 219c54b8a333 ("dix: fix DeviceStateNotify event calculation")
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1868>

diff --git a/dix/enterleave.c b/dix/enterleave.c
index c735e8807..5432ddc74 100644
--- a/dix/enterleave.c
+++ b/dix/enterleave.c
@@ -732,7 +732,7 @@ DeliverStateNotifyEvent(DeviceIntPtr dev, WindowPtr win)
         evcount += ((nval - 3) + 6)/6;
     }
 
-    BUG_RETURN(evcount <= ARRAY_SIZE(sev));
+    BUG_RETURN(evcount > ARRAY_SIZE(sev));
 
     FixDeviceStateNotify(dev, ev, k, b, v, first);