xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Tue Aug 12 15:54:24 PDT 2014
dix/devices.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1e30fc1b99bda040038e4fd56d1b27c686b44c75
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon Aug 4 10:47:03 2014 +1000
xkb: ignore floating slave devices when updating from master (#81885)
Introduced in 45fb3a934dc0db51584aba37c2f9d73deff9191d. When a device is
enabled, the master's locked state is pushed to the slave. If the device is
floating, no master exists and we triggered a NULL-pointer dereference
in XkbPushLockedStateToSlaves.
X.Org Bug 81885 <http://bugs.freedesktop.org/show_bug.cgi?id=81885>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/devices.c b/dix/devices.c
index 5d26fae..f17a3ac 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -416,7 +416,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
XISendDeviceHierarchyEvent(flags);
}
- if (!IsMaster(dev))
+ if (!IsMaster(dev) && !IsFloating(dev))
XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0, 0);
RecalculateMasterButtons(dev);
More information about the xorg-commit
mailing list