OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made D_WriteUserInfoStrings memory safe.

Browse source 
Its callers are anything but for now but this function was the main blocker for refactoring so it had to come first.
This commit is contained in:
Christoph Oelckers 2023-03-26 09:27:26 +02:00
commit ee5b6e45f8
4 changed files with 65 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/d_net.cpp
View file

@ -1505,7 +1505,9 @@ bool DoArbitrate (void *userdata)
netbuffer[1] = consoleplayer;
netbuffer[9] = data->gotsetup[0];
stream = &netbuffer[10];
D_WriteUserInfoStrings (consoleplayer, &stream, true);
auto str = D_GetUserInfoStrings (consoleplayer, true);
memcpy(stream, str.GetChars(), str.Len() + 1);
stream += str.Len();
SendSetup (data->playersdetected, data->gotsetup, int(stream - netbuffer));
}
else
@ -1520,7 +1522,9 @@ bool DoArbitrate (void *userdata)
{
netbuffer[1] = j;
stream = &netbuffer[9];
D_WriteUserInfoStrings (j, &stream, true);
auto str = D_GetUserInfoStrings(j, true);
memcpy(stream, str.GetChars(), str.Len() + 1);
stream += str.Len();
HSendPacket (i, int(stream - netbuffer));
}
}