frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Fixes 45fb3a934d
Fixes #1611

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1256>
This commit is contained in:
Peter Hutterer 2024-01-30 10:44:58 +10:00 committed by Enrico Weigelt, metux IT consult
parent 383fa6b4f7
commit f38faab295
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

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