nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

add sanity check on choose_classes_menu()

Browse Source 
If class_list contains an illegal char for mon/obj class (even if it should not happen), it might cause out-of-bound access.
This commit is contained in:
SHIRAKATA Kentaro
2023-12-12 02:37:19 +09:00
parent c0acf2f89f
commit 358278938a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/windows.c
View File

@@ -1664,15 +1664,24 @@ choose_classes_menu(const char *prompt,
win = create_nhwindow(NHW_MENU); win = create_nhwindow(NHW_MENU);
start_menu(win, MENU_BEHAVE_STANDARD); start_menu(win, MENU_BEHAVE_STANDARD);
while (*class_list) { while (*class_list) {
int idx;
selected = FALSE; selected = FALSE;
switch (category) { switch (category) {
case 0: case 0:
text = def_monsyms[def_char_to_monclass(*class_list)].explain; if ((idx = def_char_to_monclass(*class_list)) == MAXMCLASSES) {
panic("choose_classes_menu: invalid monclass '%c'", *class_list);
/*NOTREACHED*/
}
text = def_monsyms[idx].explain;
accelerator = *class_list; accelerator = *class_list;
Sprintf(buf, "%s", text); Sprintf(buf, "%s", text);
break; break;
case 1: case 1:
text = def_oc_syms[def_char_to_objclass(*class_list)].explain; if ((idx = def_char_to_objclass(*class_list)) == MAXOCLASSES) {
panic("choose_classes_menu: invalid objclass '%c'", *class_list);
/*NOTREACHED*/
}
text = def_oc_syms[idx].explain;
accelerator = next_accelerator; accelerator = next_accelerator;
Sprintf(buf, "%c %s", *class_list, text); Sprintf(buf, "%c %s", *class_list, text);
break; break;