R-b.<div>-d On Monday, August 11, 2014, Peter Hutterer <<a href="mailto:peter.hutterer@who-t.net">peter.hutterer@who-t.net</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> ping? On Mon, Aug 04, 2014 at 10:47:03AM +1000, Peter Hutterer wrote: > 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 <<a href="http://bugs.freedesktop.org/show_bug.cgi?id=81885" target="_blank">http://bugs.freedesktop.org/show_bug.cgi?id=81885</a>> > > Signed-off-by: Peter Hutterer <<a href="javascript:;" onclick="_e(event, 'cvml', 'peter.hutterer@who-t.net')">peter.hutterer@who-t.net</a>> > --- > dix/devices.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dix/devices.c b/dix/devices.c > index 7f079ff..9e1c546 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); > > -- > 1.9.3 _______________________________________________ <a href="javascript:;" onclick="_e(event, 'cvml', 'xorg-devel@lists.x.org')">xorg-devel@lists.x.org</a>: X.Org development Archives: <a href="http://lists.x.org/archives/xorg-devel" target="_blank">http://lists.x.org/archives/xorg-devel</a> Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a> </blockquote></div>