Skip to content

[SP/MP] Fix mangling of non-dynamic background music file path from pointer overlap #1334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TwelveEyes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SP/MP] Fix mangling of non-dynamic background music file path from pointer overlap #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion code/client/snd_dma.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4085,7 +4085,12 @@ static qboolean S_StartBackgroundTrack_Actual( MusicInfo_t *pMusicInfo, qboolean
char dump[16];
char name[MAX_QPATH];

Q_strncpyz( sMusic_BackgroundLoop, loop, sizeof( sMusic_BackgroundLoop ));
char *bgLoop = sMusic_BackgroundLoop;

if ( bgLoop != loop )
{// don't copy into yourself
Q_strncpyz( sMusic_BackgroundLoop, loop, sizeof( sMusic_BackgroundLoop ));
}

Q_strncpyz( name, intro, sizeof( name ) - 4 ); // this seems to be so that if the filename hasn't got an extension
// but doesn't have the room to append on either then you'll just
Expand Down
7 changes: 6 additions & 1 deletion codemp/client/snd_dma.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4093,7 +4093,12 @@ static qboolean S_StartBackgroundTrack_Actual( MusicInfo_t *pMusicInfo, qboolean
char dump[16];
char name[MAX_QPATH];

Q_strncpyz( sMusic_BackgroundLoop, loop, sizeof( sMusic_BackgroundLoop ));
char *bgLoop = sMusic_BackgroundLoop;

if ( bgLoop != loop )
{// don't copy into yourself
Q_strncpyz( sMusic_BackgroundLoop, loop, sizeof( sMusic_BackgroundLoop ));
}

Q_strncpyz( name, intro, sizeof( name ) - 4 ); // this seems to be so that if the filename hasn't got an extension
// but doesn't have the room to append on either then you'll just
Expand Down
Loading