From 5ae129baef85b47590c02e4cf61b23904d8f7aa9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 17 Mar 2009 15:47:57 +1000
Subject: [PATCH] Xi: check for existence of the button class before accessing
 it

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 Xi/exevents.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 670d50983..29dceca0e 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -843,6 +843,8 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
             for (sd = inputInfo.devices; sd; sd = sd->next) {
                 if (sd->isMaster || sd->u.master != device)
                     continue;
+                if (!sd->button)
+                    continue;
                 if ((sd->button->down[key>>3] & bit) != 0)
                     return DONT_PROCESS;
             }