xserver: Branch 'server-1.20-branch'

[GitLab Mirror]

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

New commits:
commit 3c48bd50ad33f2a533ac76afa38d6e3906ebc28a
Author: Arthur Williams <taaparthur at gmail.com>
Date:   Sun Oct 6 18:55:35 2019 +0000

    dix: Check for NULL spriteInfo in GetPairedDevice
    
    There is a race when reseting the XServer that causes spriteInfo to be
    NULL in GetPairedDevice resulting a segfault and subsequent crash. The
    problem was noticed when opening a connection, creating master devices,
    destroying master devices and closing the connection during testing.
    
    Signed-off-by: Arthur Williams <taaparthur at gmail.com>
    
    
    (cherry picked from commit e693c9657f98c334e9921ca2f8ebf710497c0c6a)

diff --git a/dix/devices.c b/dix/devices.c
index 1b18b168e..00c453980 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2656,7 +2656,7 @@ GetPairedDevice(DeviceIntPtr dev)
     if (!IsMaster(dev) && !IsFloating(dev))
         dev = GetMaster(dev, MASTER_ATTACHED);
 
-    return dev->spriteInfo->paired;
+    return dev->spriteInfo? dev->spriteInfo->paired: NULL;
 }
 
 /**