From: Pasi Kallinen <paxed@alt.org>
Date: Sun, 25 Sep 2016 15:37:24 +0000 (+0300)
Subject: Fix a bug binding menu command to a default object class character
X-Git-Tag: NetHack-3.6.1_RC01~595
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eac1d825f2200d01f413e48af37ff80f3c22834e;p=nethack

Fix a bug binding menu command to a default object class character

Due to a wrong looping variable, it was possible to bind a menu accelerator key
to a default object class.
---

diff --git a/src/options.c b/src/options.c
index 6a0a0d10c..ebe189e6e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1768,6 +1768,23 @@ char **opp;
     return FALSE;
 }
 
+/* Check if character c is illegal as a menu command key */
+boolean
+illegal_menu_cmd_key(c)
+char c;
+{
+    if (c == 0 || c == '\r' || c == '\n' || c == '\033'
+        || c == ' ' || digit(c) || (letter(c) && c != '@'))
+        return TRUE;
+    else { /* reject default object class symbols */
+        int j;
+        for (j = 1; j < MAXOCLASSES; j++)
+            if (c == def_oc_syms[j].sym)
+                return TRUE;
+    }
+    return FALSE;
+}
+
 void
 parseoptions(opts, tinitial, tfrom_file)
 register char *opts;
@@ -3226,22 +3243,11 @@ boolean tinitial, tfrom_file;
             } else if ((op = string_for_opt(opts, FALSE)) != 0) {
                 int j;
                 char c, op_buf[BUFSZ];
-                boolean isbad = FALSE;
 
                 escapes(op, op_buf);
                 c = *op_buf;
 
-                if (c == 0 || c == '\r' || c == '\n' || c == '\033'
-                    || c == ' ' || digit(c) || (letter(c) && c != '@'))
-                    isbad = TRUE;
-                else /* reject default object class symbols */
-                    for (j = 1; j < MAXOCLASSES; j++)
-                        if (c == def_oc_syms[i].sym) {
-                            isbad = TRUE;
-                            break;
-                        }
-
-                if (isbad)
+                if (illegal_menu_cmd_key(c))
                     badoption(opts);
                 else
                     add_menu_cmd_alias(c, default_menu_cmd_info[i].cmd);