From a2de1e24c5a835ab052238ad61ba7d0a7b47a53d Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 28 Dec 2025 17:46:37 +0100 Subject: [PATCH 1/3] d_cliserv: fix casts from nan to int type in few cases the files totalsize might be 0, which results in a nan, casting that to int type is undefined behavior --- src/d_clisrv.c | 68 ++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 6cf50a4d3..d4983daa2 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -365,7 +365,7 @@ void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_ CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %d... (size: %d, needed: %s)\n"), id, localtextcmd[playerid][0], sizeu1(nparam)); if (buf == NULL) { - textcmdbuf[playerid] = Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL); + textcmdbuf[playerid] = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL); textcmdbuf[playerid]->cmd[0] = 0; textcmdbuf[playerid]->next = NULL; WriteNetXCmd(textcmdbuf[playerid]->cmd, id, param, nparam); @@ -377,7 +377,7 @@ void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_ if (buf->cmd[0]+2+nparam > MAXTEXTCMD) { - buf->next = Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL); + buf->next = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL); buf->next->cmd[0] = 0; buf->next->next = NULL; WriteNetXCmd(buf->next->cmd, id, param, nparam); @@ -454,13 +454,13 @@ static UINT8* D_GetTextcmd(tic_t tic, INT32 playernum) // If we don't have an entry for the tic, make it. if (!textcmdtic) { - textcmdtic = *tctprev = Z_Calloc(sizeof (textcmdtic_t), PU_STATIC, NULL); + textcmdtic = *tctprev = (textcmdtic_t*)Z_Calloc(sizeof (textcmdtic_t), PU_STATIC, NULL); textcmdtic->tic = tic; } // If we don't have an entry for the player, make it. if (!textcmdtic->playercmds[playernum]) - textcmdtic->playercmds[playernum] = Z_Calloc(MAXTEXTCMD, PU_STATIC, NULL); + textcmdtic->playercmds[playernum] = (UINT8*)Z_Calloc(MAXTEXTCMD, PU_STATIC, NULL); return textcmdtic->playercmds[playernum]; } @@ -1141,7 +1141,7 @@ typedef enum static void GetPackets(void); static cl_mode_t cl_mode = CL_SEARCHING; -static UINT16 cl_lastcheckedfilecount = 0; // used for full file list +static UINT16 cl_lastcheckedfilecount = 0; // used for full file list // Player name send/load @@ -1182,7 +1182,7 @@ static void CV_LoadPlayerNames(UINT8 **p) // // Keep the local client informed of our status. // -static inline void CL_DrawConnectionStatus(void) +static void CL_DrawConnectionStatus(void) { INT32 ccstime = I_GetTime(); @@ -1217,21 +1217,23 @@ static inline void CL_DrawConnectionStatus(void) case CL_DOWNLOADSAVEGAME: if (filedownload.current != -1) { - UINT32 currentsize = fileneeded[filedownload.current].currentsize; - UINT32 totalsize = fileneeded[filedownload.current].totalsize; - INT32 dldlength; + INT32 dldlength = 0; + fileneeded_t *file = &fileneeded[filedownload.current]; + UINT32 currentsize = file->currentsize; + UINT32 totalsize = file->totalsize; cltext = M_GetText("Downloading game state..."); Net_GetNetStat(); - dldlength = (INT32)((currentsize/(double)totalsize) * 256); + if (totalsize != 0) + dldlength = (INT32)((currentsize/(double)totalsize) * 256); if (dldlength > 256) dldlength = 256; V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96); V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE, - va(" %4uK/%4uK",currentsize>>10,totalsize>>10)); + va(" %4uK/%4uK", currentsize>>10, totalsize>>10)); V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE, va("%3.1fK/s ", ((double)getbps)/1024)); @@ -1270,29 +1272,30 @@ static inline void CL_DrawConnectionStatus(void) { if (cl_mode == CL_CHECKFILES) { - INT32 totalfileslength; + INT32 totalfileslength = 0; INT32 checkednum = 0; INT32 i; V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP|MENUCAPS, "Press ESC to abort"); - //ima just count files here + // ima just count files here for (i = 0; i < fileneedednum; i++) if (fileneeded[i].status != FS_NOTCHECKED) checkednum++; // Loading progress V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS, "Checking server addons..."); - totalfileslength = (INT32)((checkednum/(double)(fileneedednum)) * 256); + if (fileneedednum != 0) + totalfileslength = (INT32)((checkednum/(double)fileneedednum) * 256); M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160); V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, - va(" %2u/%2u Files",checkednum,fileneedednum)); + va(" %2u/%2u Files", checkednum, fileneedednum)); } else if (cl_mode == CL_LOADFILES) { - INT32 totalfileslength; + INT32 totalfileslength = 0; INT32 loadcompletednum = 0; INT32 i; @@ -1305,12 +1308,13 @@ static inline void CL_DrawConnectionStatus(void) // Loading progress V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS, "Loading server addons..."); - totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256); + if (fileneedednum != 0) + totalfileslength = (INT32)((loadcompletednum/(double)fileneedednum) * 256); M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160); V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, - va(" %2u/%2u Files",loadcompletednum,fileneedednum)); + va(" %2u/%2u Files", loadcompletednum, fileneedednum)); } else if (cl_mode == CL_VIEWSERVER) { @@ -1438,19 +1442,22 @@ static inline void CL_DrawConnectionStatus(void) } else if (filedownload.current != -1) { - INT32 dldlength; - INT32 totalfileslength; - UINT32 totaldldsize; + INT32 dldlength = 0; + INT32 totalfileslength = 0; + UINT32 totaldldsize = 0; static char tempname[28]; fileneeded_t *file = &fileneeded[filedownload.current]; char *filename = file->filename; + UINT32 currentsize = file->currentsize; + UINT32 totalsize = file->totalsize; // Draw the bottom box. M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-58-8, 32, 1); V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-14, V_YELLOWMAP|MENUCAPS, "Press ESC to abort"); Net_GetNetStat(); - dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256); + if (totalsize != 0) + dldlength = (INT32)((currentsize/(double)totalsize) * 256); if (dldlength > 256) dldlength = 256; V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, 256, 8, 175); @@ -1483,29 +1490,30 @@ static inline void CL_DrawConnectionStatus(void) V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-22, V_YELLOWMAP|MENUCAPS, va(M_GetText("\"%s\""), tempname)); V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE|MENUCAPS, - va(" %4uK/%4uK",file->currentsize>>10,file->totalsize>>10)); + va(" %4uK/%4uK", currentsize>>10, totalsize>>10)); V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE|MENUCAPS, - va("%3.1fK/s ", ((double)getbps)/1024)); + va("%3.1fK/s ", ((double)getbps)/1024.0)); // Download progress - if (file->currentsize != file->totalsize) - totaldldsize = filedownload.completedsize+file->currentsize; //Add in single file progress download if applicable + if (currentsize != totalsize) + totaldldsize = filedownload.completedsize+currentsize; // Add in single file progress download if applicable else totaldldsize = filedownload.completedsize; V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-14, V_YELLOWMAP|MENUCAPS, "Overall Download Progress"); - totalfileslength = (INT32)((totaldldsize/(double)filedownload.totalsize) * 256); + if (filedownload.totalsize != 0) + totalfileslength = (INT32)((totaldldsize/(double)filedownload.totalsize) * 256); M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160); - if (filedownload.totalsize>>20 >= 10) //display in MB if over 10MB + if (filedownload.totalsize>>20 >= 10) // display in MB if over 10MB V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, - va(" %4uM/%4uM",totaldldsize>>20,filedownload.totalsize>>20)); + va(" %4uM/%4uM", totaldldsize>>20, filedownload.totalsize>>20)); else V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, - va(" %4uK/%4uK",totaldldsize>>10,filedownload.totalsize>>10)); + va(" %4uK/%4uK", totaldldsize>>10, filedownload.totalsize>>10)); V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, va("%2u/%2u Files ", filedownload.completednum, filedownload.totalnum)); From 242dee499d516daf80d0205c864a9eda7612a052 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 2 Jan 2026 18:34:00 +0100 Subject: [PATCH 2/3] initialize more globals that have been missed --- src/d_main.c | 2 +- src/d_net.c | 4 ++-- src/filesrch.c | 7 +++++-- src/g_game.c | 6 +++--- src/hardware/r_opengl/r_opengl.c | 2 +- src/i_time.c | 2 +- src/k_hud.c | 2 +- src/r_things.cpp | 4 ++-- 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index f37d70a2c..ab5fe7a10 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -639,7 +639,7 @@ void D_SRB2Loop(void) tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS; double deltatics = 0.0; double deltasecs = 0.0; - UINT64 precision; + UINT64 precision = 0; boolean interp = false; boolean doDisplay = false; diff --git a/src/d_net.c b/src/d_net.c index 59b31a1fb..c0d8c667b 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -59,7 +59,7 @@ static INT16 reboundsize[MAXREBOUND]; static INT32 rebound_head, rebound_tail; /// \brief max length per packet -INT16 hardware_MAXPACKETLENGTH; +INT16 hardware_MAXPACKETLENGTH = 0; boolean (*I_NetGet)(void) = NULL; void (*I_NetSend)(void) = NULL; @@ -96,7 +96,7 @@ INT32 ticruned = 0, ticmiss = 0; // globals INT32 getbps = 0, sendbps = 0; -float lostpercent = 0, duppercent = 0, gamelostpercent = 0; +float lostpercent = 0.0f, duppercent = 0.0f, gamelostpercent = 0.0f; INT32 packetheaderlength = 0; boolean Net_GetNetStat(void) diff --git a/src/filesrch.c b/src/filesrch.c index f7ff612bd..e34b51c47 100644 --- a/src/filesrch.c +++ b/src/filesrch.c @@ -49,7 +49,7 @@ size_t menupathindex[menudepth] = {}; size_t menudepthleft = menudepth; char menusearchbuf[MAXSTRINGLENGTH+1]; -textinput_t menusearch; +textinput_t menusearch = {}; char **dirmenu = NULL, **coredirmenu = NULL; // core only local for this file size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto @@ -271,10 +271,13 @@ static boolean filemenucmp(char *haystack, char *needle) { static char localhaystack[128]; strlcpy(localhaystack, haystack, 128); + if (!cv_addons_search_case.value) strupr(localhaystack); + if (cv_addons_search_type.value) - return (strstr(localhaystack, needle) != 0); + return (strstr(localhaystack, needle) != NULL); + return (!strncmp(localhaystack, needle, menusearch.length)); } diff --git a/src/g_game.c b/src/g_game.c index 2d2a49461..892579163 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -132,7 +132,7 @@ UINT8 skincolor_bluering = SKINCOLOR_STEEL; tic_t countdowntimer = 0; boolean countdowntimeup = false; -cutscene_t *cutscenes[128]; +cutscene_t *cutscenes[128] = {}; INT16 nextmapoverride = 0; boolean skipstats = false; @@ -144,7 +144,7 @@ mobj_t *blueflag = NULL; mapthing_t *rflagpoint = NULL; mapthing_t *bflagpoint = NULL; -struct quake quake; +struct quake quake = {}; // Map Header Information mapheader_t* mapheaderinfo[NUMMAPS] = {}; @@ -228,7 +228,7 @@ tic_t racecountdown = 0, exitcountdown = 0; // for racing fixed_t gravity = 0; fixed_t mapobjectscale = FRACUNIT; -struct maplighting maplighting; +struct maplighting maplighting = {}; INT16 autobalance = 0; //for CTF team balance INT16 teamscramble = 0; //for CTF team scramble diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 94656e843..edd2f51a7 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -745,7 +745,7 @@ typedef struct gl_shaderstate_s static gl_shaderstate_t gl_shaderstate; // Shader info -static float shader_leveltime = 0; +static float shader_leveltime = 0.0f; static float shader_light_x = 0.0f; static float shader_light_y = 0.0f; static float shader_light_z = 0.0f; diff --git a/src/i_time.c b/src/i_time.c index 09d5fb3fa..6e5cc3a4d 100644 --- a/src/i_time.c +++ b/src/i_time.c @@ -21,7 +21,7 @@ #include "m_fixed.h" #include "i_system.h" -timestate_t g_time; +timestate_t g_time = {}; static CV_PossibleValue_t timescale_cons_t[] = {{FRACUNIT/20, "MIN"}, {20*FRACUNIT, "MAX"}, {0, NULL}}; consvar_t cv_timescale = {"timescale", "1.0", CV_NETVAR|CV_CHEAT|CV_FLOAT, timescale_cons_t, NULL, FRACUNIT, NULL, NULL, 0, 0, NULL}; diff --git a/src/k_hud.c b/src/k_hud.c index 1d9b7fe5b..f4f7f1c1a 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -568,7 +568,7 @@ static patch_t *kp_racefinish[6]; static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES]; static patch_t *kp_winnernum[NUMPOSFRAMES]; -patch_t *kp_facenum[MAXPLAYERS+1]; +patch_t *kp_facenum[MAXPLAYERS+1] = {}; static patch_t *kp_facehighlight[8]; static patch_t *kp_rankbumper; diff --git a/src/r_things.cpp b/src/r_things.cpp index b62d9e5d7..cab9512e3 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -658,7 +658,7 @@ void R_DrawMaskedColumn(drawcolumndata_t* dc, column_t *column) dc->texturemid = basetexturemid; } -INT32 lengthcol; // column->length : for flipped column function pointers and multi-patch on 2sided wall = texture->height +INT32 lengthcol = 0; // column->length : for flipped column function pointers and multi-patch on 2sided wall = texture->height static void R_DrawFlippedMaskedColumn(drawcolumndata_t* dc, column_t *column) { @@ -3086,7 +3086,7 @@ static void R_DrawMaskedList(drawnode_t* head) void R_DrawMasked(maskcount_t* masks, INT32 nummasks) { INT32 i; - drawnode_t *heads; /**< Drawnode lists; as many as number of views/portals. */ + drawnode_t *heads = NULL; /**< Drawnode lists; as many as number of views/portals. */ heads = static_cast(calloc(nummasks, sizeof(drawnode_t))); From edbebbf082ba1b078e9f5c22fa8d60bd00fcb609 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 2 Jan 2026 18:31:02 +0100 Subject: [PATCH 3/3] fix wrong type for K_DriftSparkColor all the colour stuff is still a bit of a mess, but generally its handled as an uint8 --- src/k_hud.c | 10 +++++----- src/k_kart.c | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index f4f7f1c1a..d0146a38e 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1065,7 +1065,7 @@ static void K_initKartHUD(void) } if (timeinmap > 113 || forceshowhud) - hudtrans = cv_translucenthud.value; + hudtrans = (UINT8)cv_translucenthud.value; else if (timeinmap > 105) hudtrans = ((((INT32)timeinmap) - 105)*cv_translucenthud.value)/(113-105); else @@ -1122,9 +1122,9 @@ void K_KartPlayerHUDUpdate(player_t *player) UINT8 K_GetHudColor(void) { if (cv_colorizedhud.value && cv_colorizedhudcolor.value) - return cv_colorizedhudcolor.value; + return (UINT8)cv_colorizedhudcolor.value; - return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value); + return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : (UINT8)cv_playercolor.value); } boolean K_UseColorHud(void) @@ -1526,7 +1526,7 @@ static void K_drawKartItem(void) { localcolor = K_GetHudColor(); - switch((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3) + switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3) { // Each case is handled in threes, to give three frames of in-game time to see the item on the roulette case 0: // Sneaker @@ -2195,7 +2195,7 @@ static boolean K_drawKartPositionFaces(void) return true; if (!LUA_HudEnabled(hud_minirankings)) - return false; // Don't proceed but still return true for free play above if HUD is disabled. + return false; // Don't proceed but still return true for free play above if HUD is disabled. for (j = 0; j < numplayersingame; j++) { diff --git a/src/k_kart.c b/src/k_kart.c index 767e041a1..bb4da62a5 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3103,17 +3103,18 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I return NULL; } -static UINT16 K_DriftSparkColor(player_t *player, INT32 charge) +static UINT8 K_DriftSparkColor(player_t *player, INT32 charge) { - UINT16 color = SKINCOLOR_NONE; + UINT8 color = SKINCOLOR_NONE; + const INT32 sparkval = K_GetKartDriftSparkValue(player); - if (charge >= K_GetKartDriftSparkValue(player)*4) + if (charge >= sparkval*4) { color = K_RainbowColor(); } - else if (charge >= K_GetKartDriftSparkValue(player)*2) + else if (charge >= sparkval*2) { - if (charge <= (K_GetKartDriftSparkValue(player)*2)+(24*3)) + if (charge <= (sparkval*2)+(24*3)) color = SKINCOLOR_RASPBERRY; // transition else color = SKINCOLOR_KETCHUP;