XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-13 18:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1256>
(cherry picked from commit 9b983fecf9)
This commit is contained in:
Peter Hutterer
2024-01-30 10:44:58 +10:00
committed by Alan Coopersmith
parent d09eca6f61
commit 4374fbb8a0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dix/devices.c
View File

@@ -2696,11 +2696,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);
}