From f87bcef07991f78ce8ed311618a53e4e2049614e Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 19 May 2025 15:59:41 +0200 Subject: [PATCH] try fixing some crash with bogus netxcmds --- src/d_clisrv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 8827d91b8..9dae8eaf2 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5696,13 +5696,20 @@ static void HandlePacketFromPlayer(SINT8 node) // copy the textcmds numtxtpak = *txtpak++; + for (j = 0; j < numtxtpak; j++) { - INT32 k = *txtpak++; // playernum + INT32 playernum = *txtpak++; // playernum const size_t txtsize = txtpak[0]+1; + if (playernum < 0 || playernum >= MAXPLAYERS) + { + CONS_Alert(CONS_WARNING, "Got bogus NetXCmd packet targetting player %d\n", playernum); + return; + } + if (i >= gametic) // Don't copy old net commands - M_Memcpy(D_GetTextcmd(i, k), txtpak, txtsize); + M_Memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize); txtpak += txtsize; } }