diff --git a/src/m_menu.c b/src/m_menu.c index 842f22d44..e2a9777c6 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -8596,8 +8596,7 @@ static void M_DrawMusicTest(void) if (t == st_sel && namelength > MAXLENGTH) scrollMusicName(songname, namelength, MAXLENGTH, buf); else - strncpy(buf, songname, MAXLENGTH); - buf[MAXLENGTH] = 0; + strlcpy(buf, songname, MAXLENGTH); V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf); if (curplaying == soundtestdefs[t]) diff --git a/src/p_setup.c b/src/p_setup.c index db9b99de1..f622e3a03 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2313,9 +2313,7 @@ static void P_RunLevelScript(const char *scriptname) lumpnum_t lumpnum; char newname[9]; - strncpy(newname, scriptname, 8); - - newname[8] = '\0'; + strlcpy(newname, scriptname, sizeof(newname)); lumpnum = W_CheckNumForName(newname); diff --git a/src/s_sound.c b/src/s_sound.c index 061e5c879..794b4901f 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2200,12 +2200,11 @@ static void Command_Tunes_f(void) if (tunenum) snprintf(mapmusic.name, 7, "%sM", G_BuildMapName(tunenum)); else - strncpy(mapmusic.name, tunearg, 7); + strlcpy(mapmusic.name, tunearg, sizeof(mapmusic.name)); if (argc > 4) position = (UINT32)atoi(COM_Argv(4)); - mapmusic.name[6] = 0; mapmusic.flags = (track & MUSIC_TRACKMASK); mapmusic.position = position; mapmusic.resume = 0;