fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-03 06:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

add some extra safety checks to pak loading

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1165 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2015-02-08 08:00:56 +00:00
parent 4c4ef48fcd
commit 1c26cc3c9d
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Quake/common.c
View file

@ -1829,24 +1829,34 @@ static pack_t *COM_LoadPackFile (const char *packfile)
if (Sys_FileOpenRead (packfile, &packhandle) == -1) if (Sys_FileOpenRead (packfile, &packhandle) == -1)
return NULL; return NULL;
Sys_FileRead (packhandle, (void *)&header, sizeof(header)); Sys_FileRead (packhandle, (void *)&header, sizeof(header));
if (header.id[0] != 'P' || header.id[1] != 'A' || header.id[2] != 'C' || header.id[3] != 'K') if (header.id[0] != 'P' || header.id[1] != 'A' || header.id[2] != 'C' || header.id[3] != 'K')
Sys_Error ("%s is not a packfile", packfile); Sys_Error ("%s is not a packfile", packfile);
header.dirofs = LittleLong (header.dirofs); header.dirofs = LittleLong (header.dirofs);
header.dirlen = LittleLong (header.dirlen); header.dirlen = LittleLong (header.dirlen);
numpackfiles = header.dirlen / sizeof(dpackfile_t); numpackfiles = header.dirlen / sizeof(dpackfile_t);
if (header.dirlen < 0 || header.dirofs < 0)
{
Sys_Error ("Invalid packfile %s (dirlen: %i, dirofs: %i)",
packfile, header.dirlen, header.dirofs);
}
if (!numpackfiles)
{
Sys_Printf ("WARNING: %s has no files, ignored\n", packfile);
Sys_FileClose (packhandle);
return NULL;
}
if (numpackfiles > MAX_FILES_IN_PACK) if (numpackfiles > MAX_FILES_IN_PACK)
Sys_Error ("%s has %i files", packfile, numpackfiles); Sys_Error ("%s has %i files", packfile, numpackfiles);
if (numpackfiles != PAK0_COUNT) if (numpackfiles != PAK0_COUNT)
com_modified = true; // not the original file com_modified = true; // not the original file
//johnfitz -- dynamic gamedir loading
//Hunk_AllocName (numpackfiles * sizeof(packfile_t), "packfile");
newfiles = (packfile_t *) Z_Malloc(numpackfiles * sizeof(packfile_t)); newfiles = (packfile_t *) Z_Malloc(numpackfiles * sizeof(packfile_t));
//johnfitz
Sys_FileSeek (packhandle, header.dirofs); Sys_FileSeek (packhandle, header.dirofs);
Sys_FileRead (packhandle, (void *)info, header.dirlen); Sys_FileRead (packhandle, (void *)info, header.dirlen);
@ -1866,17 +1876,13 @@ static pack_t *COM_LoadPackFile (const char *packfile)
newfiles[i].filelen = LittleLong(info[i].filelen); newfiles[i].filelen = LittleLong(info[i].filelen);
} }
//johnfitz -- dynamic gamedir loading
//pack = Hunk_Alloc (sizeof (pack_t));
pack = (pack_t *) Z_Malloc (sizeof (pack_t)); pack = (pack_t *) Z_Malloc (sizeof (pack_t));
//johnfitz
q_strlcpy (pack->filename, packfile, sizeof(pack->filename)); q_strlcpy (pack->filename, packfile, sizeof(pack->filename));
pack->handle = packhandle; pack->handle = packhandle;
pack->numfiles = numpackfiles; pack->numfiles = numpackfiles;
pack->files = newfiles; pack->files = newfiles;
//Con_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles); //Sys_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles);
return pack; return pack;
} }