fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 07:00:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'segfault_when_removing_masters' into 'master'

Browse source 
Xi: Fix segfault when removing slave

See merge request xorg/xserver!876
This commit is contained in:
Arthur Williams 2025-12-11 05:45:16 +00:00
commit f3ac5f1e71
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Xi/xichangehierarchy.c
View file

@ -82,20 +82,24 @@ XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
info = (xXIHierarchyInfo *) &ev[1]; info = (xXIHierarchyInfo *) &ev[1];
for (dev = inputInfo.devices; dev; dev = dev->next) { for (dev = inputInfo.devices; dev; dev = dev->next) {
info->deviceid = dev->id; if (flags[dev->id] && !(flags[dev->id] & (XIMasterRemoved | XISlaveRemoved))) {
info->enabled = dev->enabled; info->deviceid = dev->id;
info->use = GetDeviceUse(dev, &info->attachment); info->enabled = dev->enabled;
info->flags = flags[dev->id]; info->use = GetDeviceUse(dev, &info->attachment);
ev->flags |= info->flags; info->flags = flags[dev->id];
info++; ev->flags |= info->flags;
info++;
}
} }
for (dev = inputInfo.off_devices; dev; dev = dev->next) { for (dev = inputInfo.off_devices; dev; dev = dev->next) {
info->deviceid = dev->id; if (flags[dev->id] && !(flags[dev->id] & (XIMasterRemoved | XISlaveRemoved))) {
info->enabled = dev->enabled; info->deviceid = dev->id;
info->use = GetDeviceUse(dev, &info->attachment); info->enabled = dev->enabled;
info->flags = flags[dev->id]; info->use = GetDeviceUse(dev, &info->attachment);
ev->flags |= info->flags; info->flags = flags[dev->id];
info++; ev->flags |= info->flags;
info++;
}
} }
for (i = 0; i < MAXDEVICES; i++) { for (i = 0; i < MAXDEVICES; i++) {