From 481e68112177d1a1c0eb920f37c372ea34eeb371 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 9 May 2007 20:27:05 +0000 Subject: [PATCH] fix using uninit'd memory. don't use 0 keycode --- openbox/modkeys.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/openbox/modkeys.c b/openbox/modkeys.c index 4eb836e5..70605511 100644 --- a/openbox/modkeys.c +++ b/openbox/modkeys.c @@ -64,12 +64,17 @@ void modkeys_startup(gboolean reconfigure) KeySym sym; /* get a keycode that is bound to the mask (i) */ KeyCode keycode = modmap->modifiermap[i*modmap->max_keypermod + j]; - /* go through each keysym bound to the given keycode */ - for (k = 0; k < keysyms_per_keycode; ++k) { - sym = keymap[(keycode-min_keycode) * keysyms_per_keycode + k]; - if (sym != NoSymbol) { - /* bind the key to the mask (e.g. Alt_L => Mod1Mask) */ - set_modkey_mask(nth_mask(i), sym); + g_print("keycode %d for mask %d\n", keycode, i); + if (keycode) { + /* go through each keysym bound to the given keycode */ + for (k = 0; k < keysyms_per_keycode; ++k) { + sym = keymap[(keycode-min_keycode) * keysyms_per_keycode + + k]; + g_print("k %d sym %s \n", k, XKeysymToString(sym)); + if (sym != NoSymbol) { + /* bind the key to the mask (e.g. Alt_L => Mod1Mask) */ + set_modkey_mask(nth_mask(i), sym); + } } } } -- 2.39.2