Merge branch 'possibly-fix-dedi-crash' into 'next'
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash) See merge request STJr/SRB2!963
This commit is contained in:
commit
aab6339e66
|
@ -3292,7 +3292,6 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
|
||||||
boolean splitscreenplayer;
|
boolean splitscreenplayer;
|
||||||
boolean rejoined;
|
boolean rejoined;
|
||||||
player_t *newplayer;
|
player_t *newplayer;
|
||||||
char *port;
|
|
||||||
|
|
||||||
if (playernum != serverplayer && !IsPlayerAdmin(playernum))
|
if (playernum != serverplayer && !IsPlayerAdmin(playernum))
|
||||||
{
|
{
|
||||||
|
@ -3323,10 +3322,15 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
|
||||||
|
|
||||||
if (server && I_GetNodeAddress)
|
if (server && I_GetNodeAddress)
|
||||||
{
|
{
|
||||||
strcpy(playeraddress[newplayernum], I_GetNodeAddress(node));
|
const char *address = I_GetNodeAddress(node);
|
||||||
port = strchr(playeraddress[newplayernum], ':');
|
char *port = NULL;
|
||||||
if (port)
|
if (address) // MI: fix msvcrt.dll!_mbscat crash?
|
||||||
*port = '\0';
|
{
|
||||||
|
strcpy(playeraddress[newplayernum], address);
|
||||||
|
port = strchr(playeraddress[newplayernum], ':');
|
||||||
|
if (port)
|
||||||
|
*port = '\0';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue