ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-05-30 08:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix potential out-of-bounds read in files.c, fix by using new FS_IsExt

Browse source 
- Add capability to load demos with com_protocol suffix, partially applied patches from Simon McVittie
- Fix demo loading if protocol number has more digits than 2
- Minor refactoring, replace all occurances of suffix "dm_" with global macro DEMOEXT
This commit is contained in:
Thilo Schulz 2011-03-07 22:08:48 +00:00
parent fef4d12d68
commit c0cca7a0a8
6 changed files with 125 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/ui/ui_atoms.c
View file

@ -162,7 +162,7 @@ void UI_LoadBestScores(const char *map, int game) {
}
UI_SetBestScores(&newInfo, qfalse);
Com_sprintf(fileName, MAX_QPATH, "demos/%s_%d.dm_%d", map, game, (int)trap_Cvar_VariableValue("protocol"));
Com_sprintf(fileName, MAX_QPATH, "demos/%s_%d.%s%d", map, game, DEMOEXT, (int)trap_Cvar_VariableValue("protocol"));
uiInfo.demoAvailable = qfalse;
if (trap_FS_FOpenFile(fileName, &f, FS_READ) >= 0) {
uiInfo.demoAvailable = qtrue;

4
code/ui/ui_main.c
View file

@ -2877,11 +2877,11 @@ static void UI_LoadDemos( void ) {
char *demoname;
int i, len;
Com_sprintf(demoExt, sizeof(demoExt), "dm_%d", (int)trap_Cvar_VariableValue("protocol"));
Com_sprintf(demoExt, sizeof(demoExt), "%s%d", DEMOEXT, (int)trap_Cvar_VariableValue("protocol"));
uiInfo.demoCount = trap_FS_GetFileList( "demos", demoExt, demolist, 4096 );
Com_sprintf(demoExt, sizeof(demoExt), ".dm_%d", (int)trap_Cvar_VariableValue("protocol"));
Com_sprintf(demoExt, sizeof(demoExt), ".%s%d", DEMOEXT, (int)trap_Cvar_VariableValue("protocol"));
if (uiInfo.demoCount) {
if (uiInfo.demoCount > MAX_DEMOS) {