From 69d62b7b12fa06f340b12fb5bbb5bfdbadf2f3d5 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 2 Mar 2025 23:13:08 +0100 Subject: [PATCH] muh huh truncuate my butt mingw32 --- src/s_sound.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index 5620d943e..adfa47c5b 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -344,7 +344,7 @@ lumpnum_t S_GetSfxLumpNum(sfxinfo_t *sfx) if (sfxlump != LUMPERROR) return sfxlump; - strlcpy(namebuf, sfx->name, sizeof namebuf); + strlcpy(namebuf, sfx->name, sizeof(namebuf)); sfxlump = W_CheckNumForName(namebuf); if (sfxlump != LUMPERROR) @@ -1988,7 +1988,7 @@ void S_KeepMusic(void) // copy over mapmusicname stuff into temporary var memset(keepmusic.name, 0, sizeof(keepmusic.name)); - strncpy(keepmusic.name, mapmusic.name, 7); + strlcpy(keepmusic.name, mapmusic.name, sizeof(keepmusic.name)); if (oldmap == gamemap && oldencore == encoremode) { @@ -2013,14 +2013,14 @@ void S_HandleReloadResetMusic(void) if (keepmapmusic) { // this is horrible, but oh well - strncpy(mapmusic.name, keepmusic.name, 7); + strlcpy(mapmusic.name, keepmusic.name, sizeof(mapmusic.name)); } else { - strncpy(mapmusic.name, mapheaderinfo[gamemap-1]->musname, 7); + + strlcpy(mapmusic.name, mapheaderinfo[gamemap-1]->musname, sizeof(mapmusic.name)); } - mapmusic.name[6] = 0; mapmusic.flags = (mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK); mapmusic.position = mapheaderinfo[gamemap-1]->muspos; mapmusic.resume = 0;