From c07e0452c770ae446e0d22826597ab1315cc13ee Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 17 May 2025 18:25:41 +0200 Subject: [PATCH 1/4] fix overflow due to too small name array size in fscan in model init --- src/hardware/hw_md2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 7a49edcb8..0a330ba15 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -495,7 +495,10 @@ void HWR_InitModels(void) size_t i; INT32 s; FILE *f; - char name[24], filename[32]; + char name[26], filename[32]; + // name[24] is used to check for names in the models.dat file that match with sprites or player skins + // sprite names are always 4 characters long, and names is for player skins can be up to 19 characters long + // PLAYERMODELPREFIX is 6 characters long float scale, offset; size_t prefixlen; From cf600046e22dcb357459d4bfd79b93512fe79982 Mon Sep 17 00:00:00 2001 From: Nep2Disk Date: Mon, 26 May 2025 15:49:28 +0000 Subject: [PATCH 2/4] Fix thwomp initdelay never being read by unarchival --- src/p_saveg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_saveg.c b/src/p_saveg.c index 03ef165a1..ddc7f456b 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -4912,6 +4912,7 @@ static thinker_t* LoadThwompThinker(savebuffer_t *save, actionf_p1 thinker) ht->delay = READINT32(save->p); ht->tag = READINT16(save->p); ht->sound = READUINT16(save->p); + ht->initDelay = READINT32(save->p); if (ht->sector) { From 7f55ee6fe457ed980942a8c3a9e0f2c0eac5c3de Mon Sep 17 00:00:00 2001 From: Kimberly Wilber Date: Sat, 14 Jun 2025 01:46:18 -0400 Subject: [PATCH 3/4] Fix #353 --- src/m_misc.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/m_misc.cpp b/src/m_misc.cpp index 16554b8ce..6f793a4b4 100644 --- a/src/m_misc.cpp +++ b/src/m_misc.cpp @@ -909,7 +909,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png "Unknown"; #endif char rendermodetxt[9]; - char maptext[8]; + char maptext[MAXMAPLUMPNAME]; char lvlttltext[48]; char locationtxt[40]; char ctrevision[40]; @@ -929,12 +929,16 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png break; } -#if 0 if (gamestate == GS_LEVEL) - snprintf(maptext, 8, "%s", G_BuildMapName(gamemap)); + { + const char* mapname = G_BuildMapName(gamemap); + if (mapname) + snprintf(maptext, sizeof(maptext), "%s", mapname); + else + snprintf(maptext, sizeof(maptext), "Unknown"); + } else -#endif - snprintf(maptext, 8, "Unknown"); + snprintf(maptext, sizeof(maptext), "Unknown"); if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl[0] != '\0') snprintf(lvlttltext, 48, "%s%s%s", From 1f1e0bdb6e94ea699074c0441e682ce342bb3503 Mon Sep 17 00:00:00 2001 From: FreakyMutantMan Date: Tue, 1 Jul 2025 23:33:21 -0700 Subject: [PATCH 4/4] Removing a slur from an old comment in favor of a potentially dated reference. --- src/lua_baselib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 873056643..5f725c4f7 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -2828,7 +2828,7 @@ static int lib_sStartSound(lua_State *L) if (!player || P_IsPartyPlayer(player)) { if (hud_running || hook_cmd_running) - origin = NULL; // HUD rendering and CMD building startsound shouldn't have an origin, just remove it instead of having a retarded error. + origin = NULL; // HUD rendering and CMD building startsound shouldn't have an origin, just remove it instead of having a [Hyperlink Blocked] error. S_StartSound(origin, sound_id); }