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