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

xfree86: Sanity check before retrieving the paired device.

Browse source 
Some pointer devices send key events [1], blindly getting the paired device
crashes the server. So let's check if the device is a pointer before we try to
get the paired device.

[1] The MS Wireless Optical Desktop 2000's multimedia keys are sent through
the pointer device, not through the keyboard device.
This commit is contained in:
Peter Hutterer 2008-04-10 08:50:43 +09:30
parent 5a4c6621aa
commit df2545b98d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hw/xfree86/common/xf86Xinput.c
View file

@ -722,7 +722,10 @@ xf86PostKeyboardEvent(DeviceIntPtr device,
int index;
#if XFreeXDGA
DeviceIntPtr pointer = GetPairedDevice(device);
DeviceIntPtr pointer;
/* Some pointers send key events, paired device is wrong then. */
pointer = IsPointerDevice(device) ? device : GetPairedDevice(device);
if (miPointerGetScreen(pointer)) {
index = miPointerGetScreen(pointer)->myNum;