dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-04-19 08:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix buffer overflow warning when calculating game time.

Browse source
This commit is contained in:
Klaus Silveira 2025-02-26 03:33:47 -05:00
parent 6daf1e9e7f
commit 0efb8c2df4
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
neo/d3xp/MultiplayerGame.cpp
View file

@ -842,7 +842,7 @@ const char *idMultiplayerGame::GameTime() {
if ( ms <= 0 ) {
strcpy( buff, "WMP --" );
} else {
sprintf( buff, "WMP %i", s );
idStr::snPrintf( buff, sizeof(buff), "WMP %i", s );
}
} else {
int timeLimit = gameLocal.serverInfo.GetInt( "si_timeLimit" );
@ -861,7 +861,16 @@ const char *idMultiplayerGame::GameTime() {
t = s / 10;
s -= t * 10;
sprintf( buff, "%i:%i%i", m, t, s );
// Format time as m:ts (minutes:tens-seconds)
// Ensure we never exceed buffer size by using idStr::snPrintf
if ( m >= 100 ) {
// If minutes exceed 99, just show 99:59
idStr::snPrintf( buff, sizeof(buff), "99:59" );
} else if ( t > 0 ) {
idStr::snPrintf( buff, sizeof(buff), "%i:%i%i", m, t, s );
} else {
idStr::snPrintf( buff, sizeof(buff), "%i:0%i", m, s );
}
}
return &buff[0];
}

24
neo/game/MultiplayerGame.cpp
View file

@ -541,7 +541,7 @@ const char *idMultiplayerGame::GameTime() {
if ( ms <= 0 ) {
strcpy( buff, "WMP --" );
} else {
sprintf( buff, "WMP %i", s );
idStr::snPrintf( buff, sizeof(buff), "WMP %i", s );
}
} else {
int timeLimit = gameLocal.serverInfo.GetInt( "si_timeLimit" );
@ -554,14 +554,22 @@ const char *idMultiplayerGame::GameTime() {
ms = 0;
}
s = ms / 1000; // => s <= 2 147 483 (INT_MAX / 1000)
m = s / 60; // => m <= 35 791
s -= m * 60; // => s < 60
t = s / 10; // => t < 6
s -= t * 10; // => s < 10
// writing <= 5 for m + 3 bytes for ":ts" + 1 byte for \0 => 16 bytes is enough
s = ms / 1000;
m = s / 60;
s -= m * 60;
t = s / 10;
s -= t * 10;
sprintf( buff, "%i:%i%i", m, t, s );
// Format time as m:ts (minutes:tens-seconds)
// Ensure we never exceed buffer size by using idStr::snPrintf
if ( m >= 100 ) {
// If minutes exceed 99, just show 99:59
idStr::snPrintf( buff, sizeof(buff), "99:59" );
} else if ( t > 0 ) {
idStr::snPrintf( buff, sizeof(buff), "%i:%i%i", m, t, s );
} else {
idStr::snPrintf( buff, sizeof(buff), "%i:0%i", m, s );
}
}
return &buff[0];
}