nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-11 22:48:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix SZ_GetSpace overflows when recording mvds.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5465 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-06-02 13:05:05 +00:00
parent 0b3b2c55ce
commit c4d339c5c0
1 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
engine/server/sv_send.c
View file

@ -2833,6 +2833,21 @@ static qboolean SV_SyncInfoBuf(client_t *client)
ClientReliableWrite_Begin(client, svc_stufftext, strlen(s)+2); ClientReliableWrite_Begin(client, svc_stufftext, strlen(s)+2);
ClientReliableWrite_String(client, s); ClientReliableWrite_String(client, s);
} }
#ifdef MVD_RECORDING
else if (client == &demo.recorder)
{
sizebuf_t *buf = MVDWrite_Begin(dem_all, 0, 2+strlen(key)+1+strlen(blobdata)+1);
if (info == &svs.info)
MSG_WriteByte(buf, svc_serverinfo);
else
{
MSG_WriteByte(buf, svc_setinfo);
MSG_WriteByte(buf, (client_t*)((char*)info-(char*)&((client_t*)NULL)->userinfo)-svs.clients);
}
MSG_WriteString(buf, key);
MSG_WriteString(buf, blobdata);
}
#endif
else else
{ {
if (info == &svs.info) if (info == &svs.info)
@ -2869,12 +2884,27 @@ static qboolean SV_SyncInfoBuf(client_t *client)
sendsize = min(bufferspace, sendsize); sendsize = min(bufferspace, sendsize);
final = (bloboffset+sendsize >= blobsize); final = (bloboffset+sendsize >= blobsize);
ClientReliableWrite_Begin(client, svcfte_setinfoblob, 8+strlen(enckey)+1+sendsize); #ifdef MVD_RECORDING
ClientReliableWrite_Byte(client, pl); //special meaning to say that this is a partial update if (client == &demo.recorder)
ClientReliableWrite_String(client, enckey); {
ClientReliableWrite_Long(client, (final?0x80000000:0)|bloboffset); sizebuf_t *buf = MVDWrite_Begin(dem_all, 0, 8+strlen(enckey)+1+sendsize);
ClientReliableWrite_Short(client, sendsize); MSG_WriteByte(buf, svcfte_setinfoblob);
ClientReliableWrite_SZ(client, blobdata+bloboffset, sendsize); MSG_WriteByte(buf, pl); //special meaning to say that this is a partial update
MSG_WriteString(buf, enckey);
MSG_WriteLong(buf, (final?0x80000000:0)|bloboffset);
MSG_WriteShort(buf, sendsize);
SZ_Write(buf, blobdata+bloboffset, sendsize);
}
else
#endif
{
ClientReliableWrite_Begin(client, svcfte_setinfoblob, 8+strlen(enckey)+1+sendsize);
ClientReliableWrite_Byte(client, pl); //special meaning to say that this is a partial update
ClientReliableWrite_String(client, enckey);
ClientReliableWrite_Long(client, (final?0x80000000:0)|bloboffset);
ClientReliableWrite_Short(client, sendsize);
ClientReliableWrite_SZ(client, blobdata+bloboffset, sendsize);
}
if (!final) if (!final)
{ {
@ -3112,7 +3142,7 @@ void SV_UpdateToReliableMessages (void)
} }
#ifdef MVD_RECORDING #ifdef MVD_RECORDING
if (sv.mvdrecording) if (sv.mvdrecording && demo.recorder.infosync.numkeys)
{ {
while (demo.recorder.infosync.numkeys) while (demo.recorder.infosync.numkeys)
{ {