xserver: Branch 'master'

[GitLab Mirror]

 Xext/xtest.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e820030de2da3d0064f36504ccad53302e0f718d
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Sep 4 09:26:55 2023 +0200

    xtest: Check whether there is a sendEventsProc to call
    
    If a client tries to send XTEST events while there is no sendEventsProc
    defined for the given device, Xwayland would call into 0x0 and crash.
    
    Make sure the handler is defined before trying to use it, to avoid the
    crash.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1574

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 5cb9e1e73..4d2910a60 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -437,7 +437,8 @@ ProcXTestFakeInput(ClientPtr client)
 
     valuator_mask_set_range(&mask, firstValuator, numValuators, valuators);
 
-    (*dev->sendEventsProc) (dev, type, ev->u.u.detail, flags, &mask);
+    if (dev->sendEventsProc)
+        (*dev->sendEventsProc) (dev, type, ev->u.u.detail, flags, &mask);
 
     if (need_ptr_update)
         miPointerUpdateSprite(dev);