From bebe62346ffeeae0d00ea4f93200b5463f6027ba Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Dec 2025 13:49:10 +0100 Subject: [PATCH] fix Flat loading code passing non null terminated strings to W_CheckNumForName --- src/p_setup.c | 8 ++++---- src/p_spec.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 887a74bb5..b7b8f03d5 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -680,11 +680,11 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat) if (i == numlevelflats) { // store the name - strlcpy(levelflat->name, flatname, sizeof (levelflat->name)); + strlcpy(levelflat->name, flatname, sizeof(levelflat->name)); strupr(levelflat->name); // store the flat lump number - levelflat->lumpnum = R_GetFlatNumForName(flatname); + levelflat->lumpnum = R_GetFlatNumForName(levelflat->name); levelflat->baselumpnum = LUMPERROR; P_CheckCyanFlat(levelflat); @@ -727,11 +727,11 @@ INT32 P_AddLevelFlatRuntime(const char *flatname) levelflat = levelflats+i; // store the name - strlcpy(levelflat->name, flatname, sizeof (levelflat->name)); + strlcpy(levelflat->name, flatname, sizeof(levelflat->name)); strupr(levelflat->name); // store the flat lump number - levelflat->lumpnum = R_GetFlatNumForName(flatname); + levelflat->lumpnum = R_GetFlatNumForName(levelflat->name); levelflat->baselumpnum = LUMPERROR; P_CheckCyanFlat(levelflat); diff --git a/src/p_spec.c b/src/p_spec.c index 7cf2694d0..dd19cc644 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -254,7 +254,9 @@ void P_InitPicAnims(void) { memcpy(&(animdefs[i].istexture), currentPos, 1); // istexture, 1 byte memcpy(animdefs[i].endname, (currentPos + 1), 9); // endname, 9 bytes + animdefs[i].endname[8] = '\0'; memcpy(animdefs[i].startname, (currentPos + 10), 9); // startname, 9 bytes + animdefs[i].startname[8] = '\0'; memcpy(&(animdefs[i].speed), (currentPos + 19), 4); // speed, 4 bytes }