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

potential infinite loop on hangup (ring prompt)

Browse Source 
Core issue noticed while working on some Qt stuff.  If hangup
occurred while prompting for "right or left?" ring finger, the
hangup yn_function() would return ESC and the accessory-on routine
would not see '\0', 'r', or 'l' so reprompt.  Endlessly.
This commit is contained in:
PatR
2020-09-01 04:11:01 -07:00
parent a2782d47f5
commit aaa4c1d37c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes37.0
+2 -1
View File
@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.294 $ $NHDT-Date: 1598859031 2020/08/31 07:30:31 $ NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.295 $ $NHDT-Date: 1598958650 2020/09/01 11:10:50 $
General Fixes and Modified Features General Fixes and Modified Features
----------------------------------- -----------------------------------
@@ -248,6 +248,7 @@ end of game inventory disclosure passed an inappropriate argument to the
inventory display routine; not noticeable for tty and curses, inventory display routine; not noticeable for tty and curses,
noticeable but not harmful for X11, and slightly harmful for Qt noticeable but not harmful for X11, and slightly harmful for Qt
turning into slime rendered hero as slime one turn too soon turning into slime rendered hero as slime one turn too soon
avoid potential infinite loop if hangup occurs at ring "right or left?" prompt
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
src/do_wear.c
+2 -1
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 do_wear.c $NHDT-Date: 1596498163 2020/08/03 23:42:43 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.134 $ */ /* NetHack 3.7 do_wear.c $NHDT-Date: 1598958650 2020/09/01 11:10:50 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.135 $ */
/* 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. */
@@ -1982,6 +1982,7 @@ struct obj *obj;
answer = yn_function(qbuf, "rl", '\0'); answer = yn_function(qbuf, "rl", '\0');
switch (answer) { switch (answer) {
case '\0': case '\0':
case '\033':
return 0; return 0;
case 'l': case 'l':
case 'L': case 'L':