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

Strlen_()

Browse Source 
Restore its ability to reject a string longer than will fit within
size_t that was lost by moving away from strnlen().  Determine the
length inline rather than using strlen().

Move it from hacklib.c to alloc.c so that utility programs have easy
access, and remove the copy of it from dlb_main.c.

Fix a logic bug in str_start_is().  If a string was considered to
be too long, it exited the loop when n was 0 but also performed
post-decrement.  So after the loop, n would be -1 and the 'if (n==0)'
test would fail.  panic() would occur if the initial string matched
and happened to be LARGEST_INT-1 characters long.
This commit is contained in:
PatR
2024-01-25 12:16:39 -08:00
parent 47fa2eb000
commit 1c08982d56
4 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/extern.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 extern.h $NHDT-Date: 1704225560 2024/01/02 19:59:20 $ $NHDT-Branch: keni-luabits2 $:$NHDT-Revision: 1.1358 $ */
/* NetHack 3.7 extern.h $NHDT-Date: 1706213788 2024/01/25 20:16:28 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1373 $ */
/* Copyright (c) Steve Creps, 1988. */
/* NetHack may be freely redistributed. See license for details. */
@@ -78,6 +78,9 @@ extern char *fmt_ptr(const void *) NONNULL;
extern int FITSint_(long long, const char *, int) NONNULLARG2;
#define FITSuint(x) FITSuint_(x, __func__, __LINE__)
extern unsigned FITSuint_(unsigned long long, const char *, int) NONNULLARG2;
/* for Strlen() which returns unsigned instead of size_t and panics for
strings of length INT_MAX (32K - 1) or longer */
extern unsigned Strlen_(const char *, const char *, int) NONNULLPTRS;
/* This next pre-processor directive covers almost the entire file,
* interrupted only occasionally to pick up specific functions as needed. */