Fix: follow up to crash when examining discoveries with '`' in certai…

…n cases.

NetHack 3.7 also had this bug, and it seems it's been present as far
back as version 3.2.0 - the NetHack devteam released the proper fix for
this earlier today (git commit 3a9e53a).

doc/evilhack-changelog.md

@@ -3343,4 +3343,5 @@ The following changes to date are:
 - Fix: crash when examining discoveries with '`' in certain cases
 - Fix: allow spear traps to be disarmed
 - Fix: heap-use-after-free (bones)
+- Fix: follow up to crash when examining discoveries with '`' in certain cases
 

src/invent.c

@@ -4102,7 +4102,7 @@ boolean unpaid, showsym;
     else if ((pos = index(oth_symbols, let)) != 0)
         class_name = oth_names[pos - oth_symbols];
     else
-        class_name = names[0];
+        class_name = names[ILLOBJ_CLASS];
 
     len = strlen(class_name) + (unpaid ? sizeof "unpaid_" : sizeof "")
           + (oclass ? (strlen(ocsymfmt) + invbuf_sympadding) : 0);

win/curses/cursdial.c

@@ -318,7 +318,8 @@ curses_character_input_dialog(const char *prompt, const char *choices,
             }
             break;
         } else if ((answer == '\n') || (answer == '\r') || (answer == ' ')) {
-            if (choices != NULL) {
+            if ((choices != NULL)
+                && ((def != '\0') || !strchr(choices, answer))) {
                 answer = def;
             }
             break;