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

food prayer tweak

Browse Source 
Guard against 16-bit int overflow when augmenting prayer timeout
for long running games.
This commit is contained in:
PatR
2021-05-16 16:42:20 -07:00
parent bc856e9a55
commit 716c50635f
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pray.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 pray.c $NHDT-Date: 1596498198 2020/08/03 23:43:18 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.144 $ */
/* NetHack 3.7 pray.c $NHDT-Date: 1621208529 2021/05/16 23:42:09 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.147 $ */
/* Copyright (c) Benson I. Margulies, Mike Stephenson, Steve Linhart, 1989. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1210,13 +1210,22 @@ pleased(aligntyp g_align)
if (kick_on_butt)
u.ublesscnt += kick_on_butt * rnz(1000);
/* Avoid games that go into infinite loops of copy-pasted commands with no
human interaction; this is a DoS vector against the computer running
NetHack. Once the turn counter is over 100000, every additional 100 turns
increases the prayer timeout by 1, thus eventually nutrition prayers will
fail and some other source of nutrition will be required. */
if (g.moves > 100000L)
u.ublesscnt += (g.moves - 100000L) / 100;
/* Avoid games that go into infinite loops of copy-pasted commands
with no human interaction; this is a DoS vector against the
computer running NetHack. Once the turn counter is over 100000,
every additional 100 turns increases the prayer timeout by 1,
thus eventually hunger prayers will fail and some other source
of nutrition will be required. The increase gets throttled if
it ever reaches 32K so that configurations using 16-bit ints are
still viable. */
if (g.moves > 100000L) {
long incr = (g.moves - 100000L) / 100L,
largest_ublesscnt_incr = (long) (LARGEST_INT - u.ublesscnt);
if (incr > largest_ublesscnt_incr)
incr = largest_ublesscnt_incr;
u.ublesscnt += (int) incr;
}
return;
}