thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-04 22:16:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-connectedservername' into 'master'

Browse source 
Fix a crash that may occur when joining a server with a maximum length server name or contact field

See merge request KartKrew/Kart!1894
This commit is contained in:
James R. 2024-01-31 01:47:18 +00:00
commit 0f5d84d8c6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_clisrv.c
View file

@ -3411,8 +3411,8 @@ void SV_ResetServer(void)
// clear server_context
memset(server_context, '-', 8);
strncpy(connectedservername, "\0", MAXSERVERNAME);
strncpy(connectedservercontact, "\0", MAXSERVERCONTACT);
strlcpy(connectedservername, "\0", MAXSERVERNAME);
strlcpy(connectedservercontact, "\0", MAXSERVERCONTACT);
CV_RevertNetVars();
@ -3442,8 +3442,8 @@ static void SV_GenContext(void)
server_context[i] = 'a'+(a-26);
}
strncpy(connectedservername, cv_servername.string, MAXSERVERNAME);
strncpy(connectedservercontact, cv_server_contact.string, MAXSERVERCONTACT);
strlcpy(connectedservername, cv_servername.string, MAXSERVERNAME);
strlcpy(connectedservercontact, cv_server_contact.string, MAXSERVERCONTACT);
}
#endif // TESTERS
@ -4578,8 +4578,8 @@ static void HandlePacketFromAwayNode(SINT8 node)
memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
strncpy(connectedservername, netbuffer->u.servercfg.server_name, MAXSERVERNAME);
strncpy(connectedservercontact, netbuffer->u.servercfg.server_contact, MAXSERVERCONTACT);
strlcpy(connectedservername, netbuffer->u.servercfg.server_name, MAXSERVERNAME);
strlcpy(connectedservercontact, netbuffer->u.servercfg.server_contact, MAXSERVERCONTACT);
}
#ifdef HAVE_DISCORDRPC

2
src/menus/transient/level-select.c
View file

@ -713,7 +713,7 @@ void M_LevelSelected(INT16 add, boolean menuupdate)
netgame = false;
multiplayer = true;
strncpy(connectedservername, cv_servername.string, MAXSERVERNAME);
strlcpy(connectedservername, cv_servername.string, MAXSERVERNAME);
// Still need to reset devmode
cht_debug = 0;