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

avoid strnlen()

Browse Source 
Replace the single strnlen() use with strlen() so as not to require
something from posix.1 (2008) when we supposedly only require c99.

If someone manages to produce a string that's longer than will fit
within size_t, strlen()'s length count will wrap and Strlen_() might
not notice.  Since size_t has to be at least 32 bits, that doesn't
seem like something to worry about.

If checking for size_t overflow is considered essential, we should
just switch to counting the length via an in-line loop that imposes
a similar limit to strnlen().
This commit is contained in:
PatR
2024-01-22 12:59:51 -08:00
parent 7f8c7dda64
commit 7c1512fa99
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/hacklib.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 hacklib.c $NHDT-Date: 1596498172 2020/08/03 23:42:52 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.85 $ */
/* NetHack 3.7 hacklib.c $NHDT-Date: 1705957184 2024/01/22 20:59:44 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.115 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2007. */
/* Copyright (c) Robert Patrick Rankin, 1991 */
@@ -235,10 +235,14 @@ c_eos(const char *s)
/* like strlen(3) but returns unsigned and panics if string is unreasonably long */
unsigned
Strlen_(const char *str, const char *file, int line){
size_t len = strnlen(str, LARGEST_INT);
Strlen_(
const char *str,
const char *file,
int line)
{
size_t len = strlen(str);
if (len == LARGEST_INT)
if (len >= LARGEST_INT)
panic("%s:%d string too long", file, line);
return (unsigned) len;
}
@@ -246,7 +250,10 @@ Strlen_(const char *str, const char *file, int line){
/* determine whether 'str' starts with 'chkstr', possibly ignoring case;
* panics on huge strings */
boolean
str_start_is(const char *str, const char *chkstr, boolean caseblind)
str_start_is(
const char *str,
const char *chkstr,
boolean caseblind)
{
int n = LARGEST_INT;