From 5b4d771f28bc7a80da0f4b1f22ba0f979267d177 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 6 Oct 2024 16:02:47 +0100 Subject: [PATCH] D_SetupVote: Fix minor memory issues memset takes UINT8-based arguments and cannot set UINT16_MAX --- src/d_netcmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 175a42470..950f95fdf 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2203,13 +2203,17 @@ void D_SetupVote(INT16 newgametype) { const UINT32 rules = gametypes[newgametype]->rules; - UINT8 buf[(VOTE_NUM_LEVELS * 2) + 4]; + UINT8 buf[(VOTE_NUM_LEVELS * 2) + 2 + 1 + 1]; UINT8 *p = buf; INT32 i; UINT16 votebuffer[VOTE_NUM_LEVELS + 1]; - memset(votebuffer, UINT16_MAX, sizeof(votebuffer)); + //memset(votebuffer, UINT16_MAX, sizeof(votebuffer)); + for (i = 0; i < VOTE_NUM_LEVELS + 1; i++) + { + votebuffer[i] = UINT16_MAX; + } WRITEINT16(p, newgametype); WRITEUINT8(p, ((cv_kartencore.value == 1) && (rules & GTR_ENCORE)));