Skip to content

Commit d416d8e

Browse files
committed
SSR: Fix message buffer sizes
1 parent 1ddc203 commit d416d8e

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

code/server/sv_record_common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ Returns first baseline index to drop due to msg overflow
865865
*/
866866
static int Record_CalculateBaselineCutoff( record_entityset_t *baselines, msg_t msg ) {
867867
int i;
868-
byte buffer[MAX_MSGLEN];
868+
byte buffer[MAX_MSGLEN_BUF];
869869
entityState_t nullstate;
870870

871871
msg.data = buffer;

code/server/sv_record_convert.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ Based on cl_main.c->CL_Record_f
101101
*/
102102
static void Record_WriteDemoGamestate( record_entityset_t *baselines, char **configstrings,
103103
int clientNum, record_demo_writer_t *rdw ) {
104-
byte buffer[MAX_MSGLEN];
104+
byte buffer[MAX_MSGLEN_BUF];
105105
msg_t msg;
106106

107107
// Delta from baselines for next snapshot
108108
rdw->haveDelta = qfalse;
109109
rdw->baselines = *baselines;
110110

111-
MSG_Init( &msg, buffer, sizeof( buffer ) );
111+
MSG_Init( &msg, buffer, MAX_MSGLEN );
112112

113113
MSG_WriteLong( &msg, 0 );
114114

@@ -143,10 +143,10 @@ Based on sv.snapshot.c->SV_SendClientSnapshot
143143
static void Record_WriteDemoSnapshot( record_entityset_t *entities, record_visibility_state_t *visibility,
144144
playerState_t *ps, int svTime, record_demo_writer_t *rdw ) {
145145
int i;
146-
byte buffer[MAX_MSGLEN];
146+
byte buffer[MAX_MSGLEN_BUF];
147147
msg_t msg;
148148

149-
MSG_Init( &msg, buffer, sizeof( buffer ) );
149+
MSG_Init( &msg, buffer, MAX_MSGLEN );
150150

151151
MSG_WriteLong( &msg, 0 );
152152

code/server/sv_record_spectator.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Based on sv_client.c->SV_SendClientGameState
260260
static void Record_SendSpectatorGamestate( spectator_t *spectator ) {
261261
client_t *cl = &spectator->cl;
262262
msg_t msg;
263-
byte msgBuf[MAX_MSGLEN];
263+
byte msgBuf[MAX_MSGLEN_BUF];
264264

265265
if ( SVC_RateLimit( &cl->gamestate_rate, 4, 1000 ) ) {
266266
return;
@@ -273,7 +273,7 @@ static void Record_SendSpectatorGamestate( spectator_t *spectator ) {
273273
cl->gamestateMessageNum = cl->netchan.outgoingSequence;
274274

275275
// Initialize message
276-
Record_InitSpectatorMessage( cl, &msg, msgBuf, sizeof( msgBuf ) );
276+
Record_InitSpectatorMessage( cl, &msg, msgBuf, MAX_MSGLEN );
277277

278278
// Write gamestate message
279279
Record_WriteGamestateMessage( &sps->currentBaselines, sv.configstrings, 0, cl->reliableSequence, &msg,
@@ -293,7 +293,7 @@ Based on sv_snapshot.c->SV_SendClientSnapshot
293293
static void Record_SendSpectatorSnapshot( spectator_t *spectator ) {
294294
client_t *cl = &spectator->cl;
295295
msg_t msg;
296-
byte msg_buf[MAX_MSGLEN];
296+
byte msg_buf[MAX_MSGLEN_BUF];
297297
spectator_frame_t *current_frame = &spectator->frames[cl->netchan.outgoingSequence % PACKET_BACKUP];
298298
spectator_frame_t *delta_frame = 0;
299299
int delta_frame_offset = 0;
@@ -335,7 +335,7 @@ static void Record_SendSpectatorSnapshot( spectator_t *spectator ) {
335335
}
336336

337337
// Initialize message
338-
Record_InitSpectatorMessage( cl, &msg, msg_buf, sizeof( msg_buf ) );
338+
Record_InitSpectatorMessage( cl, &msg, msg_buf, MAX_MSGLEN );
339339

340340
// Write snapshot message
341341
Record_WriteSnapshotMessage( &sps->frameEntities[current_frame->frameEntitiesPosition % FRAME_ENTITY_COUNT],

0 commit comments

Comments
 (0)