From 7e9809837c41a9ad0822a9bbc59362a3ba666696 Mon Sep 17 00:00:00 2001 From: Jeremy Jay Date: Mon, 16 Mar 2009 23:19:54 -0400 Subject: make sure to clear all axis_map entries don't use uninitialized axis_map entries, ie axis_map[ABS_PRESSURE] Signed-off-by: Jeremy Jay Signed-off-by: Peter Hutterer (cherry picked from commit 740dc202f735106532dce581deabe2b95c52759f) --- src/evdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/evdev.c b/src/evdev.c index 6ec7374..6aafce2 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1136,12 +1136,17 @@ EvdevInitButtonMapping(InputInfoPtr pInfo) static int EvdevInit(DeviceIntPtr device) { + int i; InputInfoPtr pInfo; EvdevPtr pEvdev; pInfo = device->public.devicePrivate; pEvdev = pInfo->private; + /* clear all axis_map entries */ + for(i = 0; i < max(ABS_CNT,REL_CNT); i++) + pEvdev->axis_map[i]=-1; + if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS) EvdevAddKeyClass(device); if (pEvdev->flags & EVDEV_BUTTON_EVENTS) -- cgit v1.2.3