From 19403d28890ba1180cc0e233e8f35fbd270653dd Mon Sep 17 00:00:00 2001 From: Ashnal Date: Thu, 27 Oct 2022 20:28:14 -0400 Subject: [PATCH 1/2] Ensure skin index read from replay file is within numskins before drawing face --- src/m_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/m_menu.c b/src/m_menu.c index b657d1c9b..367df7944 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5580,7 +5580,7 @@ static void DrawReplayHutReplayInfo(void) } // Character face! - if (W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[0].skin].facewant) != LUMPERROR) + if (demolist[dir_on[menudepthleft]].standings[0].skin < numskins && W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[0].skin].facewant) != LUMPERROR) { patch = facewantprefix[demolist[dir_on[menudepthleft]].standings[0].skin]; colormap = R_GetTranslationColormap( From 4b61bcdb819cbc69151bae2f05921b087832b8a2 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Thu, 27 Oct 2022 20:07:56 -0500 Subject: [PATCH 2/2] Correct local variable boolean type --- src/p_tick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_tick.c b/src/p_tick.c index d70c491d4..74eeab59d 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -819,7 +819,7 @@ void P_Ticker(boolean run) for (i = 0; i <= splitscreen; i++) { player_t *player = &players[displayplayers[i]]; - BOOL skyVisible = skyVisiblePerPlayer[i]; + boolean skyVisible = skyVisiblePerPlayer[i]; if (skyVisible && skyboxmo[0] && cv_skybox.value) { R_SkyboxFrame(player);