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

Merge fixes from 'NetHack-3.6' into NetHack-3.7-Jan2020

Browse Source
This commit is contained in:
nhmall
2020-01-20 21:33:20 -05:00
parent 56be3361e3 30fc4b9e05
commit 36bb4334e8
10 changed files with 73 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/windows.c
View File

@@ -241,7 +241,8 @@ void
choose_windows(s)
const char *s;
{
register int i;
int i;
char *tmps = 0;
for (i = 0; winchoices[i].procs; i++) {
if ('+' == winchoices[i].procs->name[0])
@@ -267,9 +268,22 @@ const char *s;
windowprocs.win_wait_synch = def_wait_synch;
if (!winchoices[0].procs) {
raw_printf("No window types?");
raw_printf("No window types supported?");
nh_terminate(EXIT_FAILURE);
}
/* 50: arbitrary, no real window_type names are anywhere near that long;
used to prevent potential raw_printf() overflow if user supplies a
very long string (on the order of 1200 chars) on the command line
(config file options can't get that big; they're truncated at 1023) */
#define WINDOW_TYPE_MAXLEN 50
if (strlen(s) >= WINDOW_TYPE_MAXLEN) {
tmps = (char *) alloc(WINDOW_TYPE_MAXLEN);
(void) strncpy(tmps, s, WINDOW_TYPE_MAXLEN - 1);
tmps[WINDOW_TYPE_MAXLEN - 1] = '\0';
s = tmps;
}
#undef WINDOW_TYPE_MAXLEN
if (!winchoices[1].procs) {
config_error_add(
"Window type %s not recognized. The only choice is: %s",
@@ -291,6 +305,8 @@ const char *s;
config_error_add("Window type %s not recognized. Choices are: %s",
s, buf);
}
if (tmps)
free((genericptr_t) tmps) /*, tmps = 0*/ ;
if (windowprocs.win_raw_print == def_raw_print
|| WINDOWPORT("safe-startup"))