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

avoid #wizrumorcheck crash on bad rumor input

Browse Source 
If either rumors.tru or rumors.fal was empty when makedefs made
'rumors', init_rumors() will set true_rumor_size to -1 to indicate
that rumors aren't available.  It also closes the input file, and
then #wizrumorcheck closed that again, triggering a crash in the
dlb code.

Fortune cookies and oracles work ok (just not very interesting)
when rumors aren't available.  Only the check command had trouble
with that.
This commit is contained in:
PatR
2020-03-05 13:55:45 -08:00
parent 998893ac32
commit 32b69f5c33
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/fixes36.6
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1583332314 2020/03/04 14:31:54 $ $NHDT-Branch: NetHack-3.6-Mar2020 $:$NHDT-Revision: 1.1 $ $NHDT-Date: 1583445339 2020/03/05 21:55:39 $
fixes36.6 contains a terse summary of changes made to 3.6.5 in order to fixes36.6 contains a terse summary of changes made to 3.6.5 in order to
produce 3.6.6 as well as any post-release fixes in binaries. produce 3.6.6 as well as any post-release fixes in binaries.
@@ -10,6 +10,8 @@ invalid status highlight color could be maliciously used to corrupt memory
formatting corpse names used internal buffers differently from formatting formatting corpse names used internal buffers differently from formatting
other objects and could potentially clobber memory other objects and could potentially clobber memory
avoid divide by 0 crash if 'bogusmon' (file of bogus monster types) is empty avoid divide by 0 crash if 'bogusmon' (file of bogus monster types) is empty
avoid #wizrumorcheck crash if either 'rumors.tru' or 'rumors.fal' or both
were empty when makedefs built 'rumors'
Platform- and/or Interface-Specific Fixes or Features Platform- and/or Interface-Specific Fixes or Features

41
src/rumors.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 rumors.c $NHDT-Date: 1582364450 2020/02/22 09:40:50 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.51 $ */ /* NetHack 3.6 rumors.c $NHDT-Date: 1583445339 2020/03/05 21:55:39 $ $NHDT-Branch: NetHack-3.6-Mar2020 $:$NHDT-Revision: 1.38 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -159,9 +159,10 @@ boolean exclude_cookie;
couldnt_open_file(RUMORFILE); couldnt_open_file(RUMORFILE);
true_rumor_size = -1; /* don't try to open it again */ true_rumor_size = -1; /* don't try to open it again */
} }
/* this is safe either way, so do it always since we can't get the definition
* out of makedefs.c /* this is safe either way, so do it always since we can't get the
*/ * definition out of makedefs.c
*/
#define PAD_RUMORS_TO #define PAD_RUMORS_TO
#ifdef PAD_RUMORS_TO #ifdef PAD_RUMORS_TO
/* remove padding */ /* remove padding */
@@ -188,10 +189,8 @@ rumor_check()
char *endp, line[BUFSZ], xbuf[BUFSZ], rumor_buf[BUFSZ]; char *endp, line[BUFSZ], xbuf[BUFSZ], rumor_buf[BUFSZ];
if (true_rumor_size < 0L) { /* we couldn't open RUMORFILE */ if (true_rumor_size < 0L) { /* we couldn't open RUMORFILE */
no_rumors: no_rumors:
pline("rumors not accessible."); pline("rumors not accessible.");
if (rumors)
(void) dlb_fclose(rumors);
return; return;
} }
@@ -203,29 +202,27 @@ rumor_check()
rumor_buf[0] = '\0'; rumor_buf[0] = '\0';
if (true_rumor_size == 0L) { /* if this is 1st outrumor() */ if (true_rumor_size == 0L) { /* if this is 1st outrumor() */
init_rumors(rumors); init_rumors(rumors);
if (true_rumor_size < 0L) if (true_rumor_size < 0L) {
rumors = (dlb *) 0; /* init_rumors() closes it upon failure */
goto no_rumors; /* init failed */ goto no_rumors; /* init failed */
}
} }
tmpwin = create_nhwindow(NHW_TEXT); tmpwin = create_nhwindow(NHW_TEXT);
/* /*
* reveal the values. * reveal the values.
*/ */
Sprintf(rumor_buf,
Sprintf( "T start=%06ld (%06lx), end=%06ld (%06lx), size=%06ld (%06lx)",
rumor_buf, (long) true_rumor_start, true_rumor_start,
"T start=%06ld (%06lx), end=%06ld (%06lx), size=%06ld (%06lx)", true_rumor_end, (unsigned long) true_rumor_end,
(long) true_rumor_start, true_rumor_start, true_rumor_end, true_rumor_size, (unsigned long) true_rumor_size);
(unsigned long) true_rumor_end, true_rumor_size,
(unsigned long) true_rumor_size);
putstr(tmpwin, 0, rumor_buf); putstr(tmpwin, 0, rumor_buf);
Sprintf(rumor_buf,
Sprintf( "F start=%06ld (%06lx), end=%06ld (%06lx), size=%06ld (%06lx)",
rumor_buf, (long) false_rumor_start, false_rumor_start,
"F start=%06ld (%06lx), end=%06ld (%06lx), size=%06ld (%06lx)", false_rumor_end, (unsigned long) false_rumor_end,
(long) false_rumor_start, false_rumor_start, false_rumor_end, false_rumor_size, (unsigned long) false_rumor_size);
(unsigned long) false_rumor_end, false_rumor_size,
(unsigned long) false_rumor_size);
putstr(tmpwin, 0, rumor_buf); putstr(tmpwin, 0, rumor_buf);
/* /*