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

dix: fix crash when removing devices on a buttonless MD pointer (#29669)

Browse source 
If the master does not have a button class, recalculating the number of
buttons required for this master dereferences a NULL pointer. Guard against
this, if the master pointer doesn't have a button class, it doesn't need to
update it's number of buttons.

Reproducible:
Two devices on the same master, device NB with axes but no buttons, device
A+B with axes and button .
If NB was the last one to send an event through the master when A+B is
removed from the server, master->button is NULL and leads to the above
NULL-pointer dereference.

X.Org Bug 29669 <http://bugs.freedesktop.org/show_bug.cgi?id=29669>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit ff055506f0)
This commit is contained in:
Peter Hutterer 2010-08-23 13:20:09 +10:00
parent 0f3a0ab1f0
commit 72e3e6f4a7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dix/devices.c
View file

@ -2336,7 +2336,7 @@ RecalculateMasterButtons(DeviceIntPtr slave)
maxbuttons = max(maxbuttons, dev->button->numButtons);
}
if (master->button->numButtons != maxbuttons)
if (master->button && master->button->numButtons != maxbuttons)
{
int i;
DeviceChangedEvent event;