diff --git a/src/blua/lobject.c b/src/blua/lobject.c index 0250de21d..c3cdd9eec 100644 --- a/src/blua/lobject.c +++ b/src/blua/lobject.c @@ -143,7 +143,7 @@ const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) { } case 'p': { char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */ - sprintf(buff, "%p", va_arg(argp, void *)); + snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *)); pushstr(L, buff); break; } diff --git a/src/blua/lstrlib.c b/src/blua/lstrlib.c index 6fe279bcb..5d3e4193c 100644 --- a/src/blua/lstrlib.c +++ b/src/blua/lstrlib.c @@ -776,23 +776,23 @@ static int str_format (lua_State *L) { strfrmt = scanformat(L, strfrmt, form); switch (*strfrmt++) { case 'c': { - sprintf(buff, form, (int)luaL_checknumber(L, arg)); + snprintf(buff, sizeof(buff), form, (int)luaL_checknumber(L, arg)); break; } case 'd': case 'i': { addintlen(form); - sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg)); + snprintf(buff, sizeof(buff), form, (LUA_INTFRM_T)luaL_checknumber(L, arg)); break; } case 'o': case 'u': case 'x': case 'X': { addintlen(form); - sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg)); + snprintf(buff, sizeof(buff), form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg)); break; } case 'e': case 'E': case 'f': case 'g': case 'G': { - lua_Number n = luaL_checknumber(L, arg); - sprintf(buff, form, (double)n); + lua_Number n = luaL_checknumber(L, arg); + snprintf(buff, sizeof(buff), form, (double)n); break; } case 'q': { @@ -810,7 +810,7 @@ static int str_format (lua_State *L) { continue; /* skip the `addsize' at the end */ } else { - sprintf(buff, form, s); + snprintf(buff, sizeof(buff), form, s); break; } } diff --git a/src/blua/luaconf.h b/src/blua/luaconf.h index 22fa8bf53..76ade3bfd 100644 --- a/src/blua/luaconf.h +++ b/src/blua/luaconf.h @@ -536,7 +536,7 @@ #define LUA_NUMBER_SCAN "%d" #define LUA_NUMBER_FMT "%d" #endif -#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n)) +#define lua_number2str(s,n) snprintf((s), LUAI_MAXNUMBER2STR, LUA_NUMBER_FMT, (n)) #define LUAI_MAXNUMBER2STR 12 /* 10 digits, sign, and \0 */ #define lua_str2number(s,p) ({ \ long nmr = strtol((s), (p), 10); \ diff --git a/src/command.c b/src/command.c index f09f7bf47..93d99f4ef 100644 --- a/src/command.c +++ b/src/command.c @@ -1596,7 +1596,9 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording) // send only changed cvars ... // the client will reset all netvars to default before loading WRITEUINT16(*p, 0x0000); + for (cvar = consvar_vars; cvar; cvar = cvar->next) + { if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid)) { WRITEUINT16(*p, cvar->netid); @@ -1614,7 +1616,7 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording) else { char buf[9]; - sprintf(buf, "%d", mapheaderinfo[gamemap - 1]->numlaps); + snprintf(buf, sizeof(buf), "%d", mapheaderinfo[gamemap - 1]->numlaps); WRITESTRING(*p, buf); } } @@ -1626,6 +1628,8 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording) WRITEUINT8(*p, false); ++count; } + } + WRITEUINT16(count_p, count); } @@ -1782,8 +1786,7 @@ void CV_StealthSet(consvar_t *var, const char *value) void CV_StealthSetValue(consvar_t *var, INT32 value) { char val[32]; - - sprintf(val, "%d", value); + snprintf(val, sizeof(val), "%d", value); CV_SetCVar(var, val, true); } @@ -1803,8 +1806,7 @@ void CV_Set(consvar_t *var, const char *value) void CV_SetValue(consvar_t *var, INT32 value) { char val[32]; - - sprintf(val, "%d", value); + snprintf(val, sizeof(val), "%d", value); CV_SetCVar(var, val, false); } @@ -2202,6 +2204,7 @@ void CV_SaveVariables(FILE *f) consvar_t *cvar; for (cvar = consvar_vars; cvar; cvar = cvar->next) + { if (cvar->flags & CV_SAVE) { char stringtowrite[MAXTEXTCMD+1]; @@ -2210,15 +2213,23 @@ void CV_SaveVariables(FILE *f) if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN")) { if (cvar->flags & CV_FLOAT) - sprintf(stringtowrite, "%f", FixedToFloat(cvar->value)); + { + snprintf(stringtowrite, sizeof(stringtowrite), "%f", FixedToFloat(cvar->value)); + } else - sprintf(stringtowrite, "%d", cvar->value); + { + snprintf(stringtowrite, sizeof(stringtowrite), "%d", cvar->value); + } } else - strcpy(stringtowrite, cvar->string); + { + strncpy(stringtowrite, cvar->string, sizeof(stringtowrite)-1); + stringtowrite[sizeof(stringtowrite)-1] = '\0'; + } fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite); } + } } //============================================================================ diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 060e0a303..c61ef182d 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2097,7 +2097,7 @@ static void SV_SavedGame(void) if (!cv_dumpconsistency.value) return; - sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home); + snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home); // first save it in a malloced buffer save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL); @@ -2135,7 +2135,7 @@ static void CL_LoadReceivedSavegame(boolean reloading) size_t length, decompressedlen; char tmpsave[264]; - sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home); + snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home); length = FIL_ReadFile(tmpsave, &save.buffer); @@ -2214,7 +2214,7 @@ static void CL_ReloadReceivedSavegame(void) for (i = 0; i < MAXPLAYERS; i++) { LUA_InvalidatePlayer(&players[i]); - sprintf(player_names[i], "Player %d", i + 1); + snprintf(player_names[i], MAXPLAYERNAME+1, "Player %d", i + 1); } CL_LoadReceivedSavegame(true); @@ -2950,7 +2950,7 @@ static void CL_ConnectToServer(void) tic_t asksent; char tmpsave[264]; - sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home); + snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home); filedownload.current = -1; cl_mode = CL_SEARCHING; @@ -3513,7 +3513,7 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason) player_muted[playernum] = false; // Reset the name - sprintf(player_names[playernum], "Player %d", playernum+1); + snprintf(player_names[playernum], MAXPLAYERNAME+1, "Player %d", playernum+1); player_name_changes[playernum] = 0; @@ -4475,7 +4475,7 @@ void SV_ResetServer(void) for (i = 0; i < MAXPLAYERS; i++) { LUA_InvalidatePlayer(&players[i]); - sprintf(player_names[i], "Player %d", i + 1); + snprintf(player_names[i], MAXPLAYERNAME+1, "Player %d", i + 1); } memset(player_name_changes, 0, sizeof(player_name_changes)); @@ -5534,7 +5534,7 @@ static void PT_WillResendGamestate(void) CONS_Printf(M_GetText("Reloading game state...\n")); - sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home); + snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home); // Don't get a corrupt savegame error because tmpsave already exists if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1) diff --git a/src/d_net.c b/src/d_net.c index f7e7ffecd..a11dd3401 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -1315,7 +1315,9 @@ boolean D_CheckNetGame(void) while (!debugfile && k < MAXPLAYERS) { k++; - sprintf(filename, "debug%d.txt", k); + + snprintf(filename, sizeof(filename), "debug%d.txt", k); + debugfile = fopen(va("%s" PATHSEP "%s", srb2home, filename), "w"); } diff --git a/src/d_netcmd.c b/src/d_netcmd.c index f08d0d2c8..cd8dba956 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -608,7 +608,7 @@ void D_RegisterServerCommands(void) // Set default player names // Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well for (i = 0; i < MAXPLAYERS; i++) - sprintf(player_names[i], "Player %d", 1 + i); + snprintf(player_names[i], sizeof(player_names[i]), "Player %d", 1 + i); RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor); RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref); @@ -1288,7 +1288,8 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum) else if (len == 1) // Agh! { // Last ditch effort... - sprintf(name, "%d", M_RandomKey(10)); + snprintf(name, MAXPLAYERNAME+1, "%d", M_RandomKey(10)); + if (!EnsurePlayerNameIsGood(name, playernum)) return false; } @@ -2342,11 +2343,12 @@ static char *ConcatCommandArgv(int start, int end) if (!p) I_Error("ConcatCommandArgv: Out of memory!\n"); - --end;/* handle the final argument separately */ + --end; /* handle the final argument separately */ for (i = start; i < end; ++i) { - p += sprintf(p, "%s ", COM_Argv(i)); + if (size - (p - final) > 0) + p += snprintf(p, size - (p - final), "%s ", COM_Argv(i)); } /* at this point "end" is actually the last argument's position */ @@ -4361,13 +4363,13 @@ static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum) char message[275]; if (toomany) - sprintf(message, M_GetText("Too many files loaded to add %s\n"), filename); + snprintf(message, sizeof(message), M_GetText("Too many files loaded to add %s\n"), filename); else if (ncs == FS_NOTFOUND) - sprintf(message, M_GetText("The server doesn't have %s\n"), filename); + snprintf(message, sizeof(message), M_GetText("The server doesn't have %s\n"), filename); else if (ncs == FS_MD5SUMBAD) - sprintf(message, M_GetText("Checksum mismatch on %s\n"), filename); + snprintf(message, sizeof(message), M_GetText("Checksum mismatch on %s\n"), filename); else - sprintf(message, M_GetText("Unknown error finding wad file (%s)\n"), filename); + snprintf(message, sizeof(message), M_GetText("Unknown error finding wad file (%s)\n"), filename); CONS_Printf("%s",message); @@ -5201,8 +5203,10 @@ static void Command_Mapmd5_f(void) { INT32 i; char md5tmp[33]; + for (i = 0; i < 16; ++i) - sprintf(&md5tmp[i*2], "%02x", mapmd5[i]); + snprintf(&md5tmp[i*2], 3, "%02x", mapmd5[i]); + CONS_Printf("%s: %s\n", G_BuildMapName(gamemap), md5tmp); } else diff --git a/src/d_netfil.c b/src/d_netfil.c index 613b72df5..e8d3baa7e 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -299,10 +299,13 @@ boolean CL_CheckDownloadable(void) { INT32 j; char md5tmp[33]; + for (j = 0; j < 16; j++) - sprintf(&md5tmp[j*2], "%02x", fileneeded[i].md5sum[j]); + snprintf(&md5tmp[j*2], 3, "%02x", fileneeded[i].md5sum[j]); + CONS_Printf("%s", md5tmp); } + CONS_Printf("\n"); } } diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index b6d50a712..c5ae3b451 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -542,7 +542,7 @@ void I_OutputMsg(const char *fmt, ...) I_Error("I_OutputMsg: Out of memory!\n"); va_start(argptr, fmt); - vsprintf(txt, fmt, argptr); + vsnprintf(txt, len+1, fmt, argptr); va_end(argptr); #ifdef HAVE_TTF @@ -550,7 +550,7 @@ void I_OutputMsg(const char *fmt, ...) DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt); #endif - len = strlen(txt); + len = strnlen(txt, len+1); #ifdef LOGMESSAGES if (logstream) @@ -1053,7 +1053,7 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal."); break; default: - sprintf(signal_msg, "Signal number %d", signal_num); + snprintf(signal_msg, 512, "Signal number %d", signal_num); sigmsg = (core_dumped ? "Unknown signal" : signal_msg); break; } @@ -1061,13 +1061,17 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms if (core_dumped) { if (sigmsg) - sprintf(signal_msg, "%s (core dumped)", sigmsg); + { + snprintf(signal_msg, 512, "%s (core dumped)", sigmsg); + } else + { strcat(signal_msg, " (core dumped)"); + } } else { - sprintf(signal_msg, "%s", sigmsg); + snprintf(signal_msg, 512, "%s", sigmsg); } } @@ -1764,7 +1768,8 @@ char *I_GetUserName(void) } } } - strncpy(username, p, MAXPLAYERNAME); + + snprintf(username, sizeof(username), "%s", p); } if (!fastcmp(username, "")) @@ -1820,28 +1825,23 @@ const char *I_ClipboardPaste(void) */ static boolean isWadPathOk(const char *path) { - char *wad3path = (char*)(malloc(256)); + char wad3path[256]; - if (!wad3path) - return false; - - sprintf(wad3path, pandf, path, WADKEYWORD); + snprintf(wad3path, sizeof(wad3path), pandf, path, WADKEYWORD); if (FIL_ReadFileOK(wad3path)) { - free(wad3path); return true; } - free(wad3path); return false; } -static void pathonly(char *s) +static void pathonly(char *s, size_t size) { size_t j; - for (j = strlen(s); j != (size_t)-1; j--) + for (j = strnlen(s, size); j != (size_t)-1; j--) { if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/')) { @@ -1868,11 +1868,12 @@ static const char *searchWad(const char *searchDir) static char tempsw[256] = ""; filestatus_t fstemp; - strcpy(tempsw, WADKEYWORD); + snprintf(tempsw, sizeof(tempsw), "%s", WADKEYWORD); fstemp = filesearch(tempsw, searchDir, NULL, true, 20); + if (fstemp == FS_FOUND) { - pathonly(tempsw); + pathonly(tempsw, sizeof(tempsw)); return tempsw; } @@ -1910,7 +1911,7 @@ static const char *locateWad(void) #ifndef NOCWD // examine current dir - strcpy(returnWadPath, "."); + snprintf(returnWadPath, sizeof(returnWadPath), "%s", "."); I_OutputMsg(",%s", returnWadPath); if (isWadPathOk(returnWadPath)) return NULL; @@ -1922,7 +1923,7 @@ static const char *locateWad(void) // examine user jart directory if ((envstr = I_GetEnv("HOME")) != NULL) { - sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr); + snprintf(returnWadPath, sizeof(returnWadPath), "%s" PATHSEP DEFAULTDIR, envstr); CHECKWADPATH(returnWadPath); } #endif @@ -1936,7 +1937,7 @@ static const char *locateWad(void) // examine default dirs for (i = 0; wadDefaultPaths[i]; i++) { - strcpy(returnWadPath, wadDefaultPaths[i]); + snprintf(returnWadPath, sizeof(returnWadPath), "%s", wadDefaultPaths[i]); CHECKWADPATH(returnWadPath); } diff --git a/src/discord.c b/src/discord.c index 8f937cfc1..a5e5f59c9 100644 --- a/src/discord.c +++ b/src/discord.c @@ -402,7 +402,7 @@ static void Discordrp_OnChange(void) static void DRPC_GotServerIP(UINT32 address) { const unsigned char * p = (const unsigned char *)&address; - sprintf(self_ip, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port); + snprintf(self_ip, IP_SIZE+1, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port); } /*-------------------------------------------------- diff --git a/src/f_wipe.c b/src/f_wipe.c index 32b385c9e..8abbe3397 100644 --- a/src/f_wipe.c +++ b/src/f_wipe.c @@ -111,7 +111,8 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) goto freemask; // SRB2Kart: This suddenly triggers ERRORMODE now - //sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum); + //snprintf(&lumpname[4], 3, "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum); + //lumpname[8] = 0; lumpname[4] = '0'+(masknum/10); lumpname[5] = '0'+(masknum%10); diff --git a/src/g_demo.c b/src/g_demo.c index f4240a42d..b86bbc8f8 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -2212,7 +2212,8 @@ void G_LoadDemoInfo(menudemo_t *pdemo) { CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath); pdemo->type = MD_INVALID; - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); + return; } @@ -2222,7 +2223,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo) { CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath); pdemo->type = MD_INVALID; - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); return; } @@ -2247,14 +2248,14 @@ void G_LoadDemoInfo(menudemo_t *pdemo) #ifdef DEMO_COMPAT_100 case 0x0001: pdemo->type = MD_OUTDATED; - sprintf(pdemo->title, "Legacy Replay"); + snprintf(pdemo->title, sizeof(pdemo->title), "Legacy Replay"); break; #endif // too old, cannot support. default: CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath); pdemo->type = MD_INVALID; - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); return; } @@ -2267,7 +2268,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo) { CONS_Alert(CONS_ERROR, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemo->filepath); pdemo->type = MD_INVALID; - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); return; } @@ -2288,7 +2289,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo) { CONS_Alert(CONS_ERROR, M_GetText("%s is a legacy multiplayer replay and cannot be played.\n"), pdemo->filepath); pdemo->type = MD_INVALID; - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); return; } #endif @@ -2522,7 +2523,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo) if (!handle) { CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath); - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); return; } @@ -2534,7 +2535,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo) if (count < 96 || memcmp(info_p, DEMOHEADER, 12)) { CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath); - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); return; } @@ -2563,13 +2564,13 @@ void G_LoadDemoTitle(menudemo_t *pdemo) break; #ifdef DEMO_COMPAT_100 case 0x0001: - sprintf(pdemo->title, "Legacy Replay"); + snprintf(pdemo->title, sizeof(pdemo->title), "Legacy Replay"); break; #endif // too old, cannot support. default: CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath); - sprintf(pdemo->title, "INVALID REPLAY"); + snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY"); } } diff --git a/src/g_game.c b/src/g_game.c index 50d43cf7a..c2b6499f9 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -604,14 +604,18 @@ const char *G_BuildMapName(INT32 map) } if (map < 100 && map >= 0) // ...but why use signed integer in first place? idk but this prevents warning (and potential buffer overflow lol) - sprintf(&mapname[3], "%.2d", map); + { + snprintf(&mapname[3], sizeof(mapname)-3, "%.2d", map); + } else { mapname[3] = (char)('A' + (char)((map - 100) / 36)); + if ((map - 100) % 36 < 10) mapname[4] = (char)('0' + (char)((map - 100) % 36)); else mapname[4] = (char)('A' + (char)((map - 100) % 36) - 10); + mapname[5] = '\0'; } @@ -3766,7 +3770,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride) startonmapnum = mapoverride; #endif - sprintf(savename, savegamename, slot); + snprintf(savename, sizeof(savename), savegamename, slot); length = FIL_ReadFile(savename, &save.buffer); if (!length) @@ -3778,7 +3782,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride) save.p = save.buffer; memset(vcheck, 0, sizeof (vcheck)); - sprintf(vcheck, "version %d", VERSION); + snprintf(vcheck, sizeof(vcheck), "version %d", VERSION); if (!fastcmp((const char *)save.p, (const char *)vcheck)) { @@ -3844,7 +3848,7 @@ void G_SaveGame(UINT32 savegameslot) const char *backup; savebuffer_t save = {}; - sprintf(savename, savegamename, savegameslot); + snprintf(savename, sizeof(savename), savegamename, savegameslot); backup = va("%s",savename); // save during evaluation or credits? game's over, folks! @@ -3864,7 +3868,7 @@ void G_SaveGame(UINT32 savegameslot) } memset(name, 0, sizeof (name)); - sprintf(name, "version %d", VERSION); + snprintf(name, sizeof(name), "version %d", VERSION); WRITEMEM(save.p, name, VERSIONSIZE); P_SaveGame(&save); @@ -4093,12 +4097,12 @@ char *G_BuildMapTitle(INT32 mapnum) if (!title) return NULL; - sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl); + snprintf(title, len, "%s", mapheaderinfo[mapnum-1]->lvlttl); if (zonetext) - sprintf(title + strlen(title), " %s", zonetext); + snprintf(title + strlen(title), len - strlen(title), " %s", zonetext); if (actnum) - sprintf(title + strlen(title), " %s", actnum); + snprintf(title + strlen(title), len - strlen(title), " %s", actnum); } return title; diff --git a/src/g_input.c b/src/g_input.c index c4dfece9d..31df065fc 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -1250,7 +1250,8 @@ const char *G_KeynumToString(INT32 keynum) return keynames[j].name; // create a name for unknown keys - sprintf(keynamestr, "KEY%d", keynum); + snprintf(keynamestr, sizeof(keynamestr), "KEY%d", keynum); + return keynamestr; } diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c index f53153ea9..07b7c1e5e 100644 --- a/src/hardware/hw_bsp.c +++ b/src/hardware/hw_bsp.c @@ -581,7 +581,8 @@ static void loading_status(void) I_OsPolling(); CON_Drawer(); - sprintf(s, "%d%%", (++ls_percent)<<1); + snprintf(s, sizeof(s), "%d%%", (++ls_percent)<<1); + x = BASEVIDWIDTH/2; y = BASEVIDHEIGHT/2; V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); // Black background to match fade in effect diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index baa4461e4..f7c689525 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -514,7 +514,7 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo const INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8); finallight += offset; - finallight = CLAMP(finallight, 0 , 255); + finallight = CLAMP(finallight, 0, 255); } return (FUINT)finallight; @@ -532,7 +532,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t const INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8); finallight += (fof ? -offset : offset); - finallight = CLAMP(finallight, 0 , 255); + finallight = CLAMP(finallight, 0, 255); } return (FUINT)finallight; @@ -6121,7 +6121,7 @@ static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum) } // puts the numbers into the lumpname - sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum); + snprintf(&lumpname[4], sizeof(lumpname) - 4, "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum); wipelumpnum = W_CheckNumForName(lumpname); // again, shouldn't be here really diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 0f8328041..f21f2f82d 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1247,7 +1247,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) if (!md2->model) { CONS_Debug(DBG_RENDER, "Loading model... (%s, %s)", sprnames[spr->mobj->sprite], md2->filename); - sprintf(filename, "mdls/%s", md2->filename); + snprintf(filename, sizeof(filename), "mdls/%s", md2->filename); md2->model = md2_readModel(filename); if (md2->model) @@ -1483,7 +1483,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c { char filename[64]; CONS_Debug(DBG_RENDER, "Loading model... (%s)\n", md2->filename); - sprintf(filename, "mdls/%s", md2->filename); + snprintf(filename, sizeof(filename), "mdls/%s", md2->filename); md2->model = md2_readModel(filename); if (md2->model) diff --git a/src/hardware/hw_md2load.c b/src/hardware/hw_md2load.c index d28ebf058..a880aa677 100644 --- a/src/hardware/hw_md2load.c +++ b/src/hardware/hw_md2load.c @@ -275,13 +275,6 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat) return NULL; retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL); - - //size_t fileLen; - - //int i, j; - - //size_t namelen; - //char *texturefilename; texPos = strchr(fileName, '/'); if (texPos) @@ -318,8 +311,6 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat) retModel->numMeshes = 1; // MD2 only has one mesh retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, NULL); retModel->meshes[0].numFrames = header->numFrames; - // const float WUNITS = 1.0f; - // float dataScale = WUNITS; // Tris and ST are simple structures that can be straight-copied tris = (md2triangle_t*)&buffer[header->offsetTris]; @@ -355,47 +346,6 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat) retModel->materials[t].specular[3] = 1.0f; retModel->materials[t].shininess = 0.0f; retModel->materials[t].spheremap = false; - - /* retModel->materials[t].texture = Texture::ReadTexture((char*)texturefilename, ZT_TEXTURE); - - if (!systemSucks) - { - // Check for a normal map...?? - char openfilename[1024]; - char normalMapName[1024]; - strcpy(normalMapName, texturefilename); - size_t len = strlen(normalMapName); - char *ptr = &normalMapName[len]; - ptr--; // z - ptr--; // u - ptr--; // b - ptr--; // . - *ptr++ = '_'; - *ptr++ = 'n'; - *ptr++ = '.'; - *ptr++ = 'b'; - *ptr++ = 'u'; - *ptr++ = 'z'; - *ptr++ = '\0'; - - sprintf(openfilename, "%s/%s", "textures", normalMapName); - // Convert backslashes to forward slashes - for (int k = 0; k < 1024; k++) - { - if (openfilename[k] == '\0') - break; - - if (openfilename[k] == '\\') - openfilename[k] = '/'; - } - - Resource::resource_t *res = Resource::Open(openfilename); - if (res) - { - Resource::Close(res); - retModel->materials[t].lightmap = Texture::ReadTexture(normalMapName, ZT_TEXTURE); - } - }*/ } retModel->meshes[0].numTriangles = header->numTris; @@ -425,15 +375,11 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat) md2frame_t *framePtr = (md2frame_t*)ptr; retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, NULL); retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, NULL); - - // if (retModel->materials[0].lightmap) - // retModel->meshes[0].tinyframes[i].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*header->numVerts, ztag); retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, NULL); vertptr = retModel->meshes[0].tinyframes[i].vertices; normptr = retModel->meshes[0].tinyframes[i].normals; - // tanptr = retModel->meshes[0].tinyframes[i].tangents; retModel->meshes[0].tinyframes[i].material = &retModel->materials[0]; framePtr++; // Advance to vertex list @@ -509,9 +455,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat) md2frame_t *framePtr = (md2frame_t*)ptr; retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL); retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL); - // if (retModel->materials[0].lightmap) - // retModel->meshes[0].frames[i].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*header->numTris*3, ztag); - //float *vertptr, *normptr; + normptr = (float*)retModel->meshes[0].frames[i].normals; vertptr = (float*)retModel->meshes[0].frames[i].vertices; trisPtr = tris; diff --git a/src/hardware/hw_md3load.c b/src/hardware/hw_md3load.c index 06aa6507e..73111f63e 100644 --- a/src/hardware/hw_md3load.c +++ b/src/hardware/hw_md3load.c @@ -243,48 +243,6 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat) mdShader[j].name[len-1] = 'z'; mdShader[j].name[len-2] = 'u'; mdShader[j].name[len-3] = 'b'; - - // Load material -/* retModel->materials[matCount].texture = Texture::ReadTexture(mdShader[j].name, ZT_TEXTURE); - - if (!systemSucks) - { - // Check for a normal map...?? - char openfilename[1024]; - char normalMapName[1024]; - strcpy(normalMapName, mdShader[j].name); - len = strlen(normalMapName); - char *ptr = &normalMapName[len]; - ptr--; // z - ptr--; // u - ptr--; // b - ptr--; // . - *ptr++ = '_'; - *ptr++ = 'n'; - *ptr++ = '.'; - *ptr++ = 'b'; - *ptr++ = 'u'; - *ptr++ = 'z'; - *ptr++ = '\0'; - - sprintf(openfilename, "%s/%s", "textures", normalMapName); - // Convert backslashes to forward slashes - for (int k = 0; k < 1024; k++) - { - if (openfilename[k] == '\0') - break; - - if (openfilename[k] == '\\') - openfilename[k] = '/'; - } - - Resource::resource_t *res = Resource::Open(openfilename); - if (res) - { - Resource::Close(res); - retModel->materials[matCount].lightmap = Texture::ReadTexture(normalMapName, ZT_TEXTURE); - } - }*/ } retModel->meshes[i].numFrames = mdS->numFrames; @@ -305,19 +263,15 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat) { short *vertptr; char *normptr; - // char *tanptr; int k; md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex))); retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, NULL); retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, NULL); -// if (retModel->materials[0].lightmap) -// retModel->meshes[i].tinyframes[j].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag); retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, NULL); vertptr = retModel->meshes[i].tinyframes[j].vertices; normptr = retModel->meshes[i].tinyframes[j].normals; -// tanptr = retModel->meshes[i].tinyframes[j].tangents; retModel->meshes[i].tinyframes[j].material = &retModel->materials[i]; for (k = 0; k < mdS->numVerts; k++) @@ -384,8 +338,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat) md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex))); retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL); retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL); -// if (retModel->materials[i].lightmap) -// retModel->meshes[i].frames[j].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag); + vertptr = retModel->meshes[i].frames[j].vertices; normptr = retModel->meshes[i].frames[j].normals; retModel->meshes[i].frames[j].material = &retModel->materials[i]; @@ -471,37 +424,6 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat) } } } - /* - // Tags? - retModel->numTags = mdh->numTags; - retModel->maxNumFrames = mdh->numFrames; - retModel->tags = (tag_t*)Z_Calloc(sizeof(tag_t) * retModel->numTags * mdh->numFrames, ztag); - md3Tag *mdTag = (md3Tag*)&buffer[mdh->offsetTags]; - tag_t *curTag = retModel->tags; - for (i = 0; i < mdh->numFrames; i++) - { - int j; - for (j = 0; j < retModel->numTags; j++, mdTag++) - { - strcpys(curTag->name, mdTag->name, sizeof(curTag->name) / sizeof(char)); - curTag->transform.m[0][0] = mdTag->axis[0]; - curTag->transform.m[0][1] = mdTag->axis[1]; - curTag->transform.m[0][2] = mdTag->axis[2]; - curTag->transform.m[1][0] = mdTag->axis[3]; - curTag->transform.m[1][1] = mdTag->axis[4]; - curTag->transform.m[1][2] = mdTag->axis[5]; - curTag->transform.m[2][0] = mdTag->axis[6]; - curTag->transform.m[2][1] = mdTag->axis[7]; - curTag->transform.m[2][2] = mdTag->axis[8]; - curTag->transform.m[3][0] = mdTag->origin[0] * WUNITS; - curTag->transform.m[3][1] = mdTag->origin[1] * WUNITS; - curTag->transform.m[3][2] = mdTag->origin[2] * WUNITS; - curTag->transform.m[3][3] = 1.0f; - - Matrix::Rotate(&curTag->transform, 90.0f, &Vector::Xaxis); - curTag++; - } - }*/ free(buffer); diff --git a/src/http-mserv.c b/src/http-mserv.c index 7b5fac188..c371dbb54 100644 --- a/src/http-mserv.c +++ b/src/http-mserv.c @@ -135,8 +135,7 @@ HMS_on_read (char *s, size_t _1, size_t n, void *userdata) return n; } -static struct HMS_buffer * -HMS_connect (const char *format, ...) +static struct HMS_buffer *HMS_connect(const char *format, ...) { va_list ap; CURL *curl; @@ -174,7 +173,7 @@ HMS_connect (const char *format, ...) if (cv_masterserver_token.string && cv_masterserver_token.string[0]) { quack_token = curl_easy_escape(curl, cv_masterserver_token.string, 0); - token_length = ( sizeof "&token="-1 )+ strlen(quack_token); + token_length = ( sizeof "&token="-1 ) + strlen(quack_token); } else { @@ -186,27 +185,30 @@ HMS_connect (const char *format, ...) I_lock_mutex(&hms_api_mutex); #endif - seek = strlen(hms_api) + 1;/* + '/' */ + seek = strlen(hms_api) + 1; /* + '/' */ va_start (ap, format); - url = malloc(seek + vsnprintf(NULL, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1); + size_t url_size = (seek + vsnprintf(NULL, 0, format, ap) + + sizeof HMS_QUERY_VERSION - 1 + + token_length + 1); + url = malloc(url_size); va_end (ap); - sprintf(url, "%s/", hms_api); + snprintf(url, seek + 1, "%s/", hms_api); #ifdef HAVE_THREADS I_unlock_mutex(hms_api_mutex); #endif va_start (ap, format); - seek += vsprintf(&url[seek], format, ap); + seek += vsnprintf(&url[seek], url_size - seek, format, ap); va_end (ap); strcpy(&url[seek], HMS_QUERY_VERSION); seek += sizeof HMS_QUERY_VERSION - 1; if (quack_token) - sprintf(&url[seek], "&token=%s", quack_token); + snprintf(&url[seek], url_size - seek, "&token=%s", quack_token); Printf_url(url); diff --git a/src/hu_stuff.c b/src/hu_stuff.c index e7c8c3ddb..c61ecc9f2 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -154,14 +154,14 @@ void HU_LoadGraphics(void) for (i = 0; i < HU_FONTSIZE; i++, j++) { // cache the heads-up font for entire game execution - sprintf(buffer, "STCFN%.3d", j); + snprintf(buffer, sizeof(buffer), "STCFN%.3d", j); if (W_CheckNumForName(buffer) == LUMPERROR) hu_font[i] = NULL; else hu_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); // tiny version of the heads-up font - sprintf(buffer, "TNYFN%.3d", j); + snprintf(buffer, sizeof(buffer), "TNYFN%.3d", j); if (W_CheckNumForName(buffer) == LUMPERROR) tny_font[i] = NULL; else @@ -188,7 +188,7 @@ void HU_LoadGraphics(void) for (i = 0; i < KART_FONTSIZE; i++, j++) { // cache the heads-up font for entire game execution - sprintf(buffer, "MKFNT%.3d", j); + snprintf(buffer, sizeof(buffer), "MKFNT%.3d", j); if (W_CheckNumForName(buffer) == LUMPERROR) kart_font[i] = NULL; else @@ -199,7 +199,7 @@ void HU_LoadGraphics(void) j = LT_FONTSTART; for (i = 0; i < LT_FONTSIZE; i++) { - sprintf(buffer, "LTFNT%.3d", j); + snprintf(buffer, sizeof(buffer), "LTFNT%.3d", j); j++; if (W_CheckNumForName(buffer) == LUMPERROR) @@ -212,7 +212,7 @@ void HU_LoadGraphics(void) j = CRED_FONTSTART; for (i = 0; i < CRED_FONTSIZE; i++) { - sprintf(buffer, "CRFNT%.3d", j); + snprintf(buffer, sizeof(buffer), "CRFNT%.3d", j); j++; if (W_CheckNumForName(buffer) == LUMPERROR) @@ -224,11 +224,11 @@ void HU_LoadGraphics(void) // cache numbers too! for (i = 0; i < 10; i++) { - sprintf(buffer, "STTNUM%d", i); + snprintf(buffer, sizeof(buffer), "STTNUM%d", i); tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); - sprintf(buffer, "PINGN%d", i); + snprintf(buffer, sizeof(buffer), "PINGN%d", i); pingnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); - sprintf(buffer, "OPPRNK0%d", i); + snprintf(buffer, sizeof(buffer), "OPPRNK0%d", i); ranknum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } @@ -240,7 +240,7 @@ void HU_LoadGraphics(void) // cache ping gfx: for (i = 0; i < 5; i++) { - sprintf(buffer, "PINGGFX%d", i+1); + snprintf(buffer, sizeof(buffer), "PINGGFX%d", i+1); pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } diff --git a/src/i_tcp.c b/src/i_tcp.c index 4eab1efbc..565d30d3c 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -213,7 +213,7 @@ static char *get_WSAErrorStr(int e) NULL); if (!buf[0]) // provide a fallback error message if no message is available for some reason - sprintf(buf, "Unknown error"); + snprintf(buf, sizeof(buf), "Unknown error"); return buf; } @@ -364,12 +364,12 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk) if (addr == NULL) { - sprintf(s, "No address"); + snprintf(s, sizeof(s), "No address"); } else if (inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL) { e = errno; - sprintf(s, "Unknown family type, error #%u: %s", e, strerror(e)); + snprintf(s, sizeof(s), "Unknown family type, error #%u: %s", e, strerror(e)); } #ifdef HAVE_IPV6 else if(sk->any.sa_family == AF_INET6) @@ -416,7 +416,7 @@ static const char *SOCK_GetBanMask(size_t ban) if (ban >= numbans) return NULL; - if (sprintf(s,"%d",banned[ban].mask) > 0) + if (snprintf(s, sizeof(s), "%d",banned[ban].mask) > 0) return s; return NULL; @@ -622,7 +622,6 @@ static boolean hole_punch(ssize_t c) { return false; } - } #endif //ifdef HOLEPUNCH diff --git a/src/k_hud.c b/src/k_hud.c index 9dbdb935b..71bd018c0 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -388,7 +388,7 @@ static void K_LoadSaturnHUDGraphics(void) skp_speedpatchesdial[3] = (patch_t *)W_CachePatchName("SP_DFRAC", PU_HUDGFX); skp_speedpatchesdial[4] = (patch_t *)W_CachePatchName("SP_DPERC", PU_HUDGFX); - sprintf(buffer, "K_DSPNMx"); + snprintf(buffer, sizeof(buffer), "K_DSPNMx"); for (i = 0; i < 10; i++) { buffer[7] = '0'+(i%10); @@ -507,7 +507,7 @@ static void K_LoadSaturnHUDGraphics(void) skp_speedpatchesdialclr[3] = (patch_t *)W_CachePatchName("SC_DFRAC", PU_HUDGFX); skp_speedpatchesdialclr[4] = (patch_t *)W_CachePatchName("SC_DPERC", PU_HUDGFX); - sprintf(buffer, "K_DSPNCx"); + snprintf(buffer, sizeof(buffer), "K_DSPNCx"); for (i = 0; i < 10; i++) { buffer[7] = '0'+(i%10); @@ -677,7 +677,7 @@ void K_LoadKartHUDGraphics(void) kp_racefinish[5] = (patch_t *)W_CachePatchName("K_2PFINB", PU_HUDGFX); // Position numbers - sprintf(buffer, "K_POSNxx"); + snprintf(buffer, sizeof(buffer), "K_POSNxx"); for (i = 0; i < NUMPOSNUMS; i++) { buffer[6] = '0'+i; @@ -688,14 +688,14 @@ void K_LoadKartHUDGraphics(void) } } - sprintf(buffer, "K_POSNWx"); + snprintf(buffer, sizeof(buffer), "K_POSNWx"); for (i = 0; i < NUMWINFRAMES; i++) { buffer[7] = '0'+i; kp_winnernum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - sprintf(buffer, "OPPRNKxx"); + snprintf(buffer, sizeof(buffer), "OPPRNKxx"); for (i = 0; i <= MAXPLAYERS; i++) { buffer[6] = '0'+(i/10); @@ -703,7 +703,7 @@ void K_LoadKartHUDGraphics(void) kp_facenum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - sprintf(buffer, "K_CHILIx"); + snprintf(buffer, sizeof(buffer), "K_CHILIx"); for (i = 0; i < 8; i++) { buffer[7] = '0'+(i+1); @@ -772,21 +772,21 @@ void K_LoadKartHUDGraphics(void) kp_kitchensink[1] = (patch_t *)W_CachePatchName("K_ISSINK", PU_HUDGFX); kp_sadface[1] = (patch_t *)W_CachePatchName("K_ISSAD", PU_HUDGFX); - sprintf(buffer, "K_ITINVx"); + snprintf(buffer, sizeof(buffer), "K_ITINVx"); for (i = 0; i < 7; i++) { buffer[7] = '1'+i; kp_invincibility[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - sprintf(buffer, "K_ITORBx"); + snprintf(buffer, sizeof(buffer), "K_ITORBx"); for (i = 0; i < 4; i++) { buffer[7] = '1'+i; kp_orbinaut[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - sprintf(buffer, "K_ISINVx"); + snprintf(buffer, sizeof(buffer), "K_ISINVx"); for (i = 0; i < 6; i++) { buffer[7] = '1'+i; @@ -794,7 +794,7 @@ void K_LoadKartHUDGraphics(void) } // CHECK indicators - sprintf(buffer, "K_CHECKx"); + snprintf(buffer, sizeof(buffer), "K_CHECKx"); for (i = 0; i < 6; i++) { buffer[7] = '1'+i; @@ -802,7 +802,7 @@ void K_LoadKartHUDGraphics(void) } // Eggman warning numbers - sprintf(buffer, "K_EGGNx"); + snprintf(buffer, sizeof(buffer), "K_EGGNx"); for (i = 0; i < 4; i++) { buffer[6] = '0'+i; @@ -815,7 +815,7 @@ void K_LoadKartHUDGraphics(void) kp_fpview[2] = (patch_t *)W_CachePatchName("VIEWC0E0", PU_HUDGFX); // Input UI Wheel - sprintf(buffer, "K_WHEELx"); + snprintf(buffer, sizeof(buffer), "K_WHEELx"); for (i = 0; i < 5; i++) { buffer[7] = '0'+i; @@ -823,7 +823,7 @@ void K_LoadKartHUDGraphics(void) } // HERE COMES A NEW CHALLENGER - sprintf(buffer, "K_CHALxx"); + snprintf(buffer, sizeof(buffer), "K_CHALxx"); for (i = 0; i < 25; i++) { buffer[6] = '0'+((i+1)/10); @@ -832,14 +832,14 @@ void K_LoadKartHUDGraphics(void) } // Lap start animation - sprintf(buffer, "K_LAP0x"); + snprintf(buffer, sizeof(buffer), "K_LAP0x"); for (i = 0; i < 7; i++) { buffer[6] = '0'+(i+1); kp_lapanim_lap[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - sprintf(buffer, "K_LAPFxx"); + snprintf(buffer, sizeof(buffer), "K_LAPFxx"); for (i = 0; i < 11; i++) { buffer[6] = '0'+((i+1)/10); @@ -847,7 +847,7 @@ void K_LoadKartHUDGraphics(void) kp_lapanim_final[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - sprintf(buffer, "K_LAPNxx"); + snprintf(buffer, sizeof(buffer), "K_LAPNxx"); for (i = 0; i < 10; i++) { buffer[6] = '0'+i; @@ -858,14 +858,14 @@ void K_LoadKartHUDGraphics(void) } } - sprintf(buffer, "K_LAPE0x"); + snprintf(buffer, sizeof(buffer), "K_LAPE0x"); for (i = 0; i < 2; i++) { buffer[7] = '0'+(i+1); kp_lapanim_emblem[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - sprintf(buffer, "K_LAPH0x"); + snprintf(buffer, sizeof(buffer), "K_LAPH0x"); for (i = 0; i < 3; i++) { buffer[7] = '0'+(i+1); diff --git a/src/lua_script.c b/src/lua_script.c index 4e1cfc995..eb78cd201 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -289,8 +289,7 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump) if (!name) I_Error("LUA_LoadLump: Out of memory!\n"); - sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->fullname); - name[len] = '\0'; + snprintf(name, len + 1, "%s|%s", wadfiles[wad]->filename, lump_p->fullname); } LUA_LoadFile(&f, name); // actually load file! diff --git a/src/m_menu.c b/src/m_menu.c index 2d758743d..cabcadf7f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -616,7 +616,7 @@ void Nextmap_OnChange(void) if (!gpath) return; - sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)); + snprintf(gpath, glen, "%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)); CV_StealthSetValue(&cv_dummystaff, 0); @@ -735,7 +735,7 @@ static void Dummystaff_OnChange(void) while (*temp) temp++; - sprintf(temp, " - %d", cv_dummystaff.value); + snprintf(temp, sizeof(dummystaffname) - (size_t)(temp - dummystaffname), " - %d", cv_dummystaff.value); } } @@ -825,7 +825,8 @@ static void M_ChangeCvar(INT32 choice) float increment; increment = FIXED_TO_FLOAT(cv->value)+(choice)*((currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5f : (1.0f/16.0f)); - sprintf(s,"%ld%s",(long)increment,M_Ftrim(increment)); + snprintf(s, sizeof(s), "%ld%s", (long)increment, M_Ftrim(increment)); + CV_Set(cv, s); } else @@ -4185,12 +4186,12 @@ static void PrepReplayList(boolean reset) if (dirmenu[i][DIR_TYPE] == EXT_UP) { demolist_all[i].type = MD_SUBDIR; - sprintf(demolist_all[i].title, "UP"); + snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), "UP"); } else if (dirmenu[i][DIR_TYPE] == EXT_FOLDER) { demolist_all[i].type = MD_SUBDIR; - strncpy(demolist_all[i].title, dirmenu[i] + DIR_STRING, 64); + snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), "%s", dirmenu[i] + DIR_STRING); } else { @@ -4198,7 +4199,7 @@ static void PrepReplayList(boolean reset) snprintf(demolist_all[i].filepath, sizeof(demolist_all[i].filepath), // 255 = UINT8 limit. dirmenu entries are restricted to this length (see DIR_LEN). "%s%.255s", menupath, dirmenu[i] + DIR_STRING); - sprintf(demolist_all[i].title, "....."); + snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), "....."); } } @@ -5983,7 +5984,8 @@ static void M_DrawStatsMaps(void) V_DrawString(20, 42, highlightflags|MENUCAPS, "Combined time records:"); - sprintf(beststr, "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime)); + snprintf(beststr, sizeof(beststr), "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime)); + V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, (mapsunfinished ? warningflags : 0), beststr); if (mapsunfinished) @@ -7150,7 +7152,7 @@ static void M_CheckMODVersion(int id) if (updatecheck) { - sprintf(updatestring, UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck); + snprintf(updatestring, sizeof(updatestring), UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck); #ifdef HAVE_THREADS I_lock_mutex(&m_menu_mutex); #endif @@ -9602,11 +9604,13 @@ static void M_ChangecontrolResponse(event_t *ev) menu_t *prev = currentMenu->prevMenu; if (controltochange == gc_pause) - sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"), - controltochangetext); + { + snprintf(tmp, sizeof(tmp), M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"), controltochangetext); + } else - sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"), - controltochangetext); + { + snprintf(tmp, sizeof(tmp), M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"), controltochangetext); + } M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER); currentMenu->prevMenu = prev; @@ -9627,8 +9631,7 @@ static void M_ChangeControl(INT32 choice) static char tmp[68]; controltochange = currentMenu->menuitems[choice].alphaKey; - sprintf(tmp, M_GetText("Hit the new key for\n%s\nESC for Cancel"), - currentMenu->menuitems[choice].text); + snprintf(tmp, sizeof(tmp), M_GetText("Hit the new key for\n%s\nESC for Cancel"), currentMenu->menuitems[choice].text); strlcpy(controltochangetext, currentMenu->menuitems[choice].text, 33); M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER); diff --git a/src/m_misc.c b/src/m_misc.c index 7fba30790..41dea5517 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -1253,7 +1253,6 @@ boolean M_ScreenshotResponder(event_t *ev) return true; } - void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, tic_t timer) { // How much should we scroll. Not sure why +1 is needed, but without it this function skips 2 @@ -1708,7 +1707,7 @@ const char * M_Ftrim(double f) int i; /* I know I said it's the default, but just in case... */ - sprintf(dig, "%.6f", fabs(modf(f, &f))); + snprintf(dig, sizeof(dig), "%.6f", fabs(modf(f, &f))); /* trim trailing zeroes */ for (i = strlen(dig)-1; dig[i] == '0'; --i) @@ -1814,35 +1813,35 @@ TMatrix *RotateZMatrix(angle_t rad) char *sizeu1(size_t num) { static char sizeu1_buf[28]; - sprintf(sizeu1_buf, "%"PRIdS, num); + snprintf(sizeu1_buf, sizeof(sizeu1_buf), "%" PRIdS, num); return sizeu1_buf; } char *sizeu2(size_t num) { static char sizeu2_buf[28]; - sprintf(sizeu2_buf, "%"PRIdS, num); + snprintf(sizeu2_buf, sizeof(sizeu2_buf), "%" PRIdS, num); return sizeu2_buf; } char *sizeu3(size_t num) { static char sizeu3_buf[28]; - sprintf(sizeu3_buf, "%"PRIdS, num); + snprintf(sizeu3_buf, sizeof(sizeu3_buf), "%" PRIdS, num); return sizeu3_buf; } char *sizeu4(size_t num) { static char sizeu4_buf[28]; - sprintf(sizeu4_buf, "%"PRIdS, num); + snprintf(sizeu4_buf, sizeof(sizeu4_buf), "%" PRIdS, num); return sizeu4_buf; } char *sizeu5(size_t num) { static char sizeu5_buf[28]; - sprintf(sizeu5_buf, "%"PRIdS, num); + snprintf(sizeu5_buf, sizeof(sizeu5_buf), "%" PRIdS, num); return sizeu5_buf; } diff --git a/src/p_setup.c b/src/p_setup.c index c878d35d4..1d9586406 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -180,7 +180,7 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg) // don't use va() because the calling function probably uses it char mapnum[10]; - sprintf(mapnum, "%hd", gamemap); + snprintf(mapnum, sizeof(mapnum), "%hd", gamemap); CON_LogMessage("Map "); CON_LogMessage(mapnum); CON_LogMessage(" is corrupt: "); @@ -2205,7 +2205,7 @@ void P_SetupLevelSky(INT32 skynum, boolean global) { char skytexname[12]; - sprintf(skytexname, "SKY%d", skynum); + snprintf(skytexname, sizeof(skytexname), "SKY%d", skynum); skytexture = R_TextureNumForName(skytexname); levelskynum = skynum; @@ -2450,23 +2450,26 @@ static void P_ForceCharacter(const char *forcecharskin) if (netgame) { char skincmd[33]; + if (splitscreen) { - sprintf(skincmd, "skin2 %s\n", forcecharskin); + snprintf(skincmd, sizeof(skincmd), "skin2 %s\n", forcecharskin); CV_Set(&cv_skin2, forcecharskin); + if (splitscreen > 1) { - sprintf(skincmd, "skin3 %s\n", forcecharskin); + snprintf(skincmd, sizeof(skincmd), "skin3 %s\n", forcecharskin); CV_Set(&cv_skin3, forcecharskin); + if (splitscreen > 2) { - sprintf(skincmd, "skin4 %s\n", forcecharskin); + snprintf(skincmd, sizeof(skincmd), "skin4 %s\n", forcecharskin); CV_Set(&cv_skin4, forcecharskin); } } } - sprintf(skincmd, "skin %s\n", forcecharskin); + snprintf(skincmd, sizeof(skincmd), "skin %s\n", forcecharskin); COM_BufAddText(skincmd); } else @@ -2523,7 +2526,7 @@ static void P_LoadRecordGhosts(void) const char *mapname = G_BuildMapName(gamemap); - sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname); + snprintf(gpath, glen, "%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname); // Best Time ghost if (cv_ghost_besttime.value) @@ -2879,7 +2882,8 @@ static void P_SetupPlayer(void) if (!demo.playback && multiplayer && D_NumPlayers()) { static char buf[256]; - sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap)); + + snprintf(buf, sizeof(buf), "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap)); I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755); I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755); diff --git a/src/p_user.c b/src/p_user.c index 8480b0e60..42b206830 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -625,15 +625,23 @@ boolean P_EndingMusic(player_t *player) } if (G_RaceGametype() && bestlocalpos == MAXPLAYERS+1) - sprintf(buffer, "k*fail"); // F-Zero death results theme + { + snprintf(buffer, sizeof(buffer), "k*fail"); // F-Zero death results theme + } else { if (bestlocalpos == 1) - sprintf(buffer, "k*win"); + { + snprintf(buffer, sizeof(buffer), "k*win"); + } else if (isPlayerLosing(bestlocalplayer)) - sprintf(buffer, "k*lose"); + { + snprintf(buffer, sizeof(buffer), "k*lose"); + } else - sprintf(buffer, "k*ok"); + { + snprintf(buffer, sizeof(buffer), "k*ok"); + } } S_SpeedMusic(1.0f); diff --git a/src/s_sound.c b/src/s_sound.c index 39c671879..a1165cbdf 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -334,7 +334,7 @@ lumpnum_t S_GetSfxLumpNum(sfxinfo_t *sfx) char namebuf[9]; lumpnum_t sfxlump; - sprintf(namebuf, "ds%s", sfx->name); + snprintf(namebuf, sizeof(namebuf), "ds%s", sfx->name); sfxlump = W_CheckNumForName(namebuf); if (sfxlump != LUMPERROR) diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 48ba6a21e..a505f7002 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -577,7 +577,7 @@ void I_OutputMsg(const char *fmt, ...) I_Error("I_OutputMsg: Out of memory!\n"); va_start(argptr, fmt); - vsprintf(txt, fmt, argptr); + vsnprintf(txt, len+1, fmt, argptr); va_end(argptr); #ifdef HAVE_TTF @@ -585,7 +585,7 @@ void I_OutputMsg(const char *fmt, ...) DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt); #endif - len = strlen(txt); + len = strnlen(txt, len+1); #ifdef LOGMESSAGES if (logstream) @@ -983,13 +983,13 @@ void I_InitJoystick(UINT8 index) { char dbpath[1024]; - sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb.txt", srb2path); + snprintf(dbpath, sizeof(dbpath), "%s" PATHSEP "gamecontrollerdb.txt", srb2path); SDL_GameControllerAddMappingsFromFile(dbpath); } { char dbpath[1024]; - sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb_user.txt", srb2home); + snprintf(dbpath, sizeof(dbpath), "%s" PATHSEP "gamecontrollerdb_user.txt", srb2home); SDL_GameControllerAddMappingsFromFile(dbpath); } @@ -1151,8 +1151,7 @@ const char *I_GetJoyName(INT32 joyindex) if (tempname) { - memcpy(joyname, tempname, 255); - joyname[255] = '\0'; + snprintf(joyname, sizeof(joyname), "%s", tempname); } } @@ -1697,16 +1696,20 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms if (core_dumped) { if (sigmsg) - sprintf(signal_msg, "%s (core dumped)", sigmsg); + { + snprintf(signal_msg, 512, "%s (core dumped)", sigmsg); + } else + { strcat(signal_msg, " (core dumped)"); + } } else { - sprintf(signal_msg, "%s", sigmsg); + snprintf(signal_msg, 512, "%s", sigmsg); } - sprintf(signal_name, "%s", signame); + snprintf(signal_name, 128, "%s", signame); } int I_OpenURL(const char *url) @@ -2341,7 +2344,8 @@ char *I_GetUserName(void) } } } - strncpy(username, p, MAXPLAYERNAME); + + snprintf(username, sizeof(username), "%s", p); } if (!fastcmp(username, "")) @@ -2386,13 +2390,15 @@ INT32 I_PutEnv(char *variable) INT32 I_ClipboardCopy(const char *data, size_t size) { char storage[256]; + if (size > 255) size = 255; - memcpy(storage, data, size); - storage[size] = 0; + + snprintf(storage, sizeof(storage), "%.*s", (int)size, data); if (SDL_SetClipboardText(storage)) return 0; + return -1; } @@ -2405,7 +2411,7 @@ const char *I_ClipboardPaste(void) return NULL; clipboard_contents = SDL_GetClipboardText(); - strlcpy(clipboard_modified, clipboard_contents, 256); + snprintf(clipboard_modified, sizeof(clipboard_modified), "%s", clipboard_contents); SDL_free(clipboard_contents); while (*i) @@ -2434,28 +2440,23 @@ const char *I_ClipboardPaste(void) */ static boolean isWadPathOk(const char *path) { - char *wad3path = static_cast(malloc(256)); + char wad3path[256]; - if (!wad3path) - return false; - - sprintf(wad3path, pandf, path, WADKEYWORD); + snprintf(wad3path, sizeof(wad3path), pandf, path, WADKEYWORD); if (FIL_ReadFileOK(wad3path)) { - free(wad3path); return true; } - free(wad3path); return false; } -static void pathonly(char *s) +static void pathonly(char *s, size_t size) { size_t j; - for (j = strlen(s); j != (size_t)-1; j--) + for (j = strnlen(s, size); j != (size_t)-1; j--) { if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/')) { @@ -2482,11 +2483,12 @@ static const char *searchWad(const char *searchDir) static char tempsw[256] = ""; filestatus_t fstemp; - strcpy(tempsw, WADKEYWORD); + snprintf(tempsw, sizeof(tempsw), "%s", WADKEYWORD); fstemp = filesearch(tempsw, searchDir, NULL, true, 20); + if (fstemp == FS_FOUND) { - pathonly(tempsw); + pathonly(tempsw, sizeof(tempsw)); return tempsw; } @@ -2524,7 +2526,7 @@ static const char *locateWad(void) #ifndef NOCWD // examine current dir - strcpy(returnWadPath, "."); + snprintf(returnWadPath, sizeof(returnWadPath), "%s", "."); I_OutputMsg(",%s", returnWadPath); if (isWadPathOk(returnWadPath)) return NULL; @@ -2536,7 +2538,7 @@ static const char *locateWad(void) // examine user jart directory if ((envstr = I_GetEnv("HOME")) != NULL) { - sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr); + snprintf(returnWadPath, sizeof(returnWadPath), "%s" PATHSEP DEFAULTDIR, envstr); CHECKWADPATH(returnWadPath); } #endif @@ -2550,7 +2552,7 @@ static const char *locateWad(void) // examine default dirs for (i = 0; wadDefaultPaths[i]; i++) { - strcpy(returnWadPath, wadDefaultPaths[i]); + snprintf(returnWadPath, sizeof(returnWadPath), "%s", wadDefaultPaths[i]); CHECKWADPATH(returnWadPath); } diff --git a/src/sdl/i_ttf.c b/src/sdl/i_ttf.c index f2cd497ee..fcba5ec46 100644 --- a/src/sdl/i_ttf.c +++ b/src/sdl/i_ttf.c @@ -183,13 +183,17 @@ void I_TTFDrawText(TTF_Font *font, TextQuality quality, INT32 fgR, INT32 fgG, IN TTFRect.x = TTFRectCheck.x; TTFRect.y = TTFRectCheck.y; } + // Copy the character to the text buffer. - sprintf(textbuffer, "%s%c", textbuffer, c); + snprintf(textbuffer, sizeof(textbuffer), "%s%c", textbuffer, c); + // Hack to allow TTF_SizeText to work properly. - sprintf(linebuffer, "%c", c); + snprintf(linebuffer, sizeof(linebuffer), "%c", c); + // If we have reached the end of the screen, move to the next available line. TTF_SizeText(currentfont, linebuffer, &w, &h); TTFRectCheck.x += w; + if (TTFRectCheck.x >= res.width) { // Render cached text to the SDL surface. @@ -204,8 +208,10 @@ void I_TTFDrawText(TTF_Font *font, TextQuality quality, INT32 fgR, INT32 fgG, IN TTFRect.y = TTFRectCheck.y; } } + // Add 1 to the pointer reference for the character to process. textmsg++; + // Copy contents of the now-old buffer to somewhere else, so it can be referenced in next loop. prevc = c; } diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index be67b69eb..420326043 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -868,7 +868,7 @@ boolean I_SetSongSpeed(float speed) { // deprecated in 0.5.0 char modspd[13]; - sprintf(modspd, "%g", speed); + snprintf(modspd, sizeof(modspd), "%g", speed); openmpt_module_ctl_set(openmpt_mhandle, "play.tempo_factor", modspd); } #else diff --git a/src/st_stuff.c b/src/st_stuff.c index c8bdd5d51..bc7f9e3e3 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -591,7 +591,7 @@ static void ST_overlayDrawer(void) char name[MAXPLAYERNAME+12]; INT32 y = (stplyrnum == 0) ? 4 : BASEVIDHEIGHT/2-12; - sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]); + snprintf(name, sizeof(name), "VIEWPOINT: %s", player_names[stplyr-players]); V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name); } else if (splitscreen) diff --git a/src/w_wad.c b/src/w_wad.c index a8bdc0f9b..5d0771dc3 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -292,8 +292,7 @@ static inline void W_LoadDehackedLumpsPK3(UINT16 wadnum) if (!name) I_Error("W_LoadDehackedLumpsPK3: Out of memory!\n"); - sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->fullname); - name[length] = '\0'; + snprintf(name, length + 1, "%s|%s", wadfiles[wadnum]->filename, lump_p->fullname); CONS_Printf("Loading SOC from %s\n", name); DEH_LoadDehackedLumpPwad(wadnum, posStart); free(name); @@ -328,8 +327,7 @@ static inline void W_LoadDehackedLumps(UINT16 wadnum) if (!name) I_Error("W_LoadDehackedLumps: Out of memory!\n"); - sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->fullname); - name[length] = '\0'; + snprintf(name, length + 1, "%s|%s", wadfiles[wadnum]->filename, lump_p->fullname); CONS_Printf(M_GetText("Loading SOC from %s\n"), name); DEH_LoadDehackedLumpPwad(wadnum, lump); diff --git a/src/win32/win_dbg.c b/src/win32/win_dbg.c index d47117698..067936be9 100644 --- a/src/win32/win_dbg.c +++ b/src/win32/win_dbg.c @@ -118,7 +118,7 @@ static VOID FPrintf(HANDLE fileHandle, LPCSTR lpFmt, ...) DWORD bytesWritten; va_start(arglist, lpFmt); - vsnprintf(str, 1999, lpFmt, arglist); + vsnprintf(str, sizeof(str), lpFmt, arglist); va_end(arglist); WriteFile(fileHandle, str, (DWORD)strlen(str), &bytesWritten, NULL); diff --git a/src/y_inter.c b/src/y_inter.c index a92392f39..bcb6a649e 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -153,7 +153,7 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32)) ; else if ((data.rankingsmode = (boolean)rankingsmode)) { - sprintf(data.levelstring, "* Total Rankings *"); + snprintf(data.levelstring, sizeof(data.levelstring), "* Total Rankings *"); data.encore = false; } else @@ -162,32 +162,41 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32)) if (mapheaderinfo[prevmap]->levelflags & LF_NOZONE) { if (mapheaderinfo[prevmap]->actnum[0]) + { snprintf(data.levelstring, - sizeof data.levelstring, + sizeof(data.levelstring), "* %s %s *", mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->actnum); + } else + { snprintf(data.levelstring, - sizeof data.levelstring, + sizeof(data.levelstring), "* %s *", mapheaderinfo[prevmap]->lvlttl); + } } else { const char *zonttl = (mapheaderinfo[prevmap]->zonttl[0] ? mapheaderinfo[prevmap]->zonttl : "Zone"); + if (mapheaderinfo[prevmap]->actnum[0]) + { snprintf(data.levelstring, - sizeof data.levelstring, + sizeof(data.levelstring), "* %s %s %s *", mapheaderinfo[prevmap]->lvlttl, zonttl, mapheaderinfo[prevmap]->actnum); + } else + { snprintf(data.levelstring, - sizeof data.levelstring, + sizeof(data.levelstring), "* %s %s *", mapheaderinfo[prevmap]->lvlttl, zonttl); + } } - data.levelstring[sizeof data.levelstring - 1] = '\0'; + data.levelstring[sizeof(data.levelstring) - 1] = '\0'; data.encore = encoremode; @@ -652,7 +661,8 @@ static void Y_UpdateRecordReplays(void) if ((gpath = malloc(glen)) == NULL) I_Error("Out of memory for replay filepath\n"); - sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap)); + snprintf(gpath, glen, "%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap)); + snprintf(lastdemo, 255, "%s-%s-last.lmp", gpath, cv_chooseskin.string); if (FIL_FileExists(lastdemo))