From e5bae89d0f716de6f1e52bcafb2d855f26179818 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 22 Oct 2025 15:34:24 +0200 Subject: [PATCH] fix namescrollbuf and mapmusic.name copies ensure those are properly null terminated as reported by ubsan --- src/m_menu.c | 8 ++++++-- src/p_spec.c | 3 +-- src/w_wad.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index e9915cb9c..a7be33c42 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7179,17 +7179,21 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) namescroll = 0; } - if (renderisnewtic) namescroll++; + if (renderisnewtic) + namescroll++; char *addonname = wadfiles[mapwads[cv_nextmap.value-1]]->filename; INT32 len; INT32 charlimit = min((size_t)(21 + (dupadjust/5)), sizeof(namescrollbuf)-1); + nameonly(addonname); len = strlen(addonname); + if (len > charlimit) M_ScrollString(addonname, len, namescrollbuf, charlimit, namescroll); else - strncpy(namescrollbuf, addonname, sizeof(namescrollbuf)); + strncpy(namescrollbuf, addonname, sizeof(namescrollbuf) - 1); + V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT|MENUCAPS, namescrollbuf); // variable reuse... } diff --git a/src/p_spec.c b/src/p_spec.c index cf2ca3e3e..e7b032131 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2091,8 +2091,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) // Change the music and apply position/fade operations else { - strncpy(mapmusic.name, sides[line->sidenum[0]].text, 7); - mapmusic.name[6] = 0; + strlcpy(mapmusic.name, sides[line->sidenum[0]].text, sizeof(mapmusic.name)); mapmusic.flags = tracknum & MUSIC_TRACKMASK; if (!(line->flags & ML_BLOCKMONSTERS)) diff --git a/src/w_wad.c b/src/w_wad.c index 1cfb3f616..95992fb42 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -261,7 +261,7 @@ static inline void W_LoadDehackedLumpsPK3(UINT16 wadnum) sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->fullname); name[length] = '\0'; - CONS_Printf(M_GetText("Loading SOC from %s\n"), name); + CONS_Printf("Loading SOC from %s\n", name); DEH_LoadDehackedLumpPwad(wadnum, posStart); free(name); }