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

match_str2clr() fix

Browse Source 
Integrity fix.  Make sure color values obtained via atoi() are sane
so that use as array indices can't go out of bounds.
This commit is contained in:
PatR
2020-03-03 16:46:04 -08:00
parent 7902bacf70
commit cb18f60331
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.116 $ $NHDT-Date: 1583193505 2020/03/02 23:58:25 $
$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $ $NHDT-Date: 1583282760 2020/03/04 00:46:00 $
General Fixes and Modified Features
-----------------------------------
@@ -63,6 +63,7 @@ display wasn't updating immediately after toggling hilite_pet option
randomly choosing role could lead to crash via segfault
if eel bite attack caused hero to move (killed + rehumanized + crawled out
of water), its grab attack could succeed even if no longer adjacent
invalid status highlight color could be maliciously used to corrupt memory
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

13
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 options.c $NHDT-Date: 1582748890 2020/02/26 20:28:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.451 $ */
/* NetHack 3.7 options.c $NHDT-Date: 1583282760 2020/03/04 00:46:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.457 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */
@@ -6529,12 +6529,13 @@ char *str;
c = colornames[i].color;
break;
}
if (i == SIZE(colornames) && (*str >= '0' && *str <= '9'))
if (i == SIZE(colornames) && digit(*str))
c = atoi(str);
if (c == CLR_MAX)
config_error_add("Unknown color '%s'", str);
if (c < 0 || c >= CLR_MAX) {
config_error_add("Unknown color '%.60s'", str);
c = CLR_MAX; /* "none of the above" */
}
return c;
}
@@ -6565,7 +6566,7 @@ boolean complain;
}
if (a == -1 && complain)
config_error_add("Unknown text attribute '%s'", str);
config_error_add("Unknown text attribute '%.50s'", str);
return a;
}