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

static ananlyzer issue for alloc.c

Browse Source 
Verifying that strlen(string) isn't too long, then allocating and
copying strlen(string)+1 draws a complaint about strcpy() overflowing
its output buffer.

Not an issue for regular play, but could matter for config file and
sysconf manipulation.
This commit is contained in:
PatR
2025-01-18 18:04:09 -08:00
parent 6a457056a3
commit ba8076b142
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/alloc.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 alloc.c $NHDT-Date: 1706213795 2024/01/25 20:16:35 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.34 $ */ /* NetHack 3.7 alloc.c $NHDT-Date: 1737281026 2025/01/19 02:03:46 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.38 $ */
/* 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. */
@@ -221,6 +221,10 @@ nhdupstr(const char *string, const char *file, int line)
/* we've got some info about the caller, so use it instead of __func__ */ /* we've got some info about the caller, so use it instead of __func__ */
unsigned len = FITSuint_(strlen(string), file, line); unsigned len = FITSuint_(strlen(string), file, line);
if (FITSuint(len + 1, file, line) < len)
panic("nhdupstr: string length overflow, line %d of %s",
line, file);
return strcpy((char *) nhalloc(len + 1, file, line), string); return strcpy((char *) nhalloc(len + 1, file, line), string);
} }
#undef dupstr #undef dupstr
@@ -233,7 +237,11 @@ nhdupstr(const char *string, const char *file, int line)
char * char *
dupstr(const char *string) dupstr(const char *string)
{ {
unsigned len = FITSuint_(strlen(string), __func__, (int) __LINE__); size_t len = strlen(string);
/* make sure len+1 doesn't overflow plain unsigned (for alloc()) */
if (len > (unsigned) (~0U - 1U))
panic("dupstr: string length overflow");
return strcpy((char *) alloc(len + 1), string); return strcpy((char *) alloc(len + 1), string);
} }
@@ -245,7 +253,7 @@ dupstr_n(const char *string, unsigned int *lenout)
size_t len = strlen(string); size_t len = strlen(string);
if (len >= LARGEST_INT) if (len >= LARGEST_INT)
panic("string too long"); panic("dupstr_n: string too long");
*lenout = (unsigned int) len; *lenout = (unsigned int) len;
return strcpy((char *) alloc(len + 1), string); return strcpy((char *) alloc(len + 1), string);
} }

4
win/share/tile2bmp.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 tile2bmp.c $NHDT-Date: 1596498340 2020/08/03 23:45:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.32 $ */ /* NetHack 3.7 tile2bmp.c $NHDT-Date: 1737281026 2025/01/19 02:03:46 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.51 $ */
/* Copyright (c) NetHack PC Development Team 1995 */ /* Copyright (c) NetHack PC Development Team 1995 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -60,8 +60,6 @@ lelong(int32_t x)
#endif #endif
} }
unsigned FITSuint_(unsigned long long, const char *, int);
#ifdef __GNUC__ #ifdef __GNUC__
typedef struct tagBMIH { typedef struct tagBMIH {
uint32_t biSize; uint32_t biSize;