add_keybinding: always allocate the new keybinding

Fixes infinite loop repoted by Miciah. Also simply continue when wgetch
returns ERR (-1) instead of calling get_keybinding() etc.

diff --git a/tig.c b/tig.c
index aac7c4e23c90d548ebe9979bb157394d9f825aa3..6c2b7d08f8b460a286cc717363b4fb180ed03e02 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -767,10 +767,9 @@ static struct keybinding *keybindings[ARRAY_SIZE(keymap_table)];
 static void
 add_keybinding(enum keymap keymap, enum request request, int key)
 {
-       struct keybinding *keybinding = keybindings[keymap];
+       struct keybinding *keybinding;
 
-       if (!keybinding)
-               keybinding = calloc(1, sizeof(*keybinding));
+       keybinding = calloc(1, sizeof(*keybinding));
        if (!keybinding)
                die("Failed to allocate keybinding");
 
@@ -3532,6 +3531,8 @@ main(int argc, char *argv[])
 
                /* Refresh, accept single keystroke of input */
                key = wgetch(status_win);
+               if (key == ERR)
+                       continue;
 
                request = get_keybinding(display[current_view]->keymap, key);