[PATCH] vfb: add a name to the pointer and keyboard
Julien Cristau
jcristau at debian.org
Fri Apr 2 14:20:24 PDT 2010
Fixes a crash in XIQueryDevice which calls strlen on a NULL pointer.
#0 strlen () at ../sysdeps/x86_64/strlen.S:31
#1 0x00000000004c16ed in SizeDeviceInfo (dev=0x969bd0)
at ../../Xi/xiquerydevice.c:204
#2 0x00000000004c1a01 in ProcXIQueryDevice (client=0xa57510)
at ../../Xi/xiquerydevice.c:98
Debian bug#575905 <http://bugs.debian.org/575905>
Reported-by: "Bernhard R. Link" <brlink at debian.org>
Signed-off-by: Julien Cristau <jcristau at debian.org>
---
Resending with fixed commit message, git had eaten the lines starting
with #.
hw/vfb/InitInput.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 35d1dc4..3136e93 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -139,7 +139,9 @@ InitInput(int argc, char *argv[])
p = AddInputDevice(serverClient, vfbMouseProc, TRUE);
k = AddInputDevice(serverClient, vfbKeybdProc, TRUE);
RegisterPointerDevice(p);
+ p->name = strdup("mouse");
RegisterKeyboardDevice(k);
+ k->name = strdup("keyboard");
(void)mieqInit();
}
--
1.7.0.3
More information about the xorg-devel
mailing list