diff --git a/dix/devices.c b/dix/devices.c index 3cf63f0a7..4d853298f 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2728,7 +2728,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; } /**