fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-08 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dix: don't push the XKB state to a non-existing master keyboard

Browse source 
If our master keyboard is disabled, GetMaster() returns NULL and
we segfault in XkbPushLockedStateToSlaves().

Fixes 45fb3a934d
Fixes #1611

(cherry picked from commit 9b983fecf9)

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1767>
This commit is contained in:
Peter Hutterer 2024-01-30 10:44:58 +10:00 • committed by Olivier Fourdan
parent 743f66d6a2
commit de2e2e8d45
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dix/devices.c
View file

@ -2686,11 +2686,14 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
dev->spriteInfo->paired = dev; dev->spriteInfo->paired = dev;
} }
else { else {
DeviceIntPtr keyboard = GetMaster(dev, MASTER_KEYBOARD);
dev->spriteInfo->sprite = master->spriteInfo->sprite; dev->spriteInfo->sprite = master->spriteInfo->sprite;
dev->spriteInfo->paired = master; dev->spriteInfo->paired = master;
dev->spriteInfo->spriteOwner = FALSE; dev->spriteInfo->spriteOwner = FALSE;
XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0, 0); if (keyboard)
XkbPushLockedStateToSlaves(keyboard, 0, 0);
RecalculateMasterButtons(master); RecalculateMasterButtons(master);
} }