[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] ui: do not call XGetAtomName if keycodes is not an
From: |
Alex Suykov |
Subject: |
[Qemu-devel] [PATCH] ui: do not call XGetAtomName if keycodes is not an atom |
Date: |
Sat, 7 Jul 2012 02:01:17 +0300 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
XkbGetKeyboard may return zero instead of a valid atom
in names->keycodes in some cases. XGetAtomName(dpy, 0)
results in BadAtom error and crashes qemu.
Signed-off-by: Alex Suykov <address@hidden>
---
ui/sdl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/sdl.c b/ui/sdl.c
index f6f711c..e74b892 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -269,7 +269,7 @@ static int check_for_evdev(void)
desc = XkbGetKeyboard(info.info.x11.display,
XkbGBN_AllComponentsMask,
XkbUseCoreKbd);
- if (desc && desc->names) {
+ if (desc && desc->names && desc->names->keycodes) {
keycodes = XGetAtomName(info.info.x11.display, desc->names->keycodes);
if (keycodes == NULL) {
fprintf(stderr, "could not lookup keycode name\n");
--
1.7.11.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH] ui: do not call XGetAtomName if keycodes is not an atom,
Alex Suykov <=