vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

filesystem: dir.c: safer string operations

Browse source
This commit is contained in:
Velaron 2022-11-21 14:11:55 +02:00 • committed by Alibek Omarov
parent fcd741e2b8
commit 43c6175918
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
filesystem/dir.c
View file

@ -38,7 +38,7 @@ int FS_FindFile_DIR( searchpath_t *search, const char *path )
{ {
char netpath[MAX_SYSPATH]; char netpath[MAX_SYSPATH];
Q_sprintf( netpath, "%s%s", search->filename, path ); Q_snprintf( netpath, sizeof( netpath ), "%s%s", search->filename, path );
if( FS_SysFileExists( netpath, !( search->flags & FS_CUSTOM_PATH ) ) ) if( FS_SysFileExists( netpath, !( search->flags & FS_CUSTOM_PATH ) ) )
return 0; return 0;
@ -66,16 +66,16 @@ void FS_Search_DIR( searchpath_t *search, stringlist_t *list, const char *patter
if( basepathlength ) memcpy( basepath, pattern, basepathlength ); if( basepathlength ) memcpy( basepath, pattern, basepathlength );
basepath[basepathlength] = '\0'; basepath[basepathlength] = '\0';
Q_strcpy( temp, basepath ); Q_snprintf( netpath, sizeof( netpath ), "%s%s", search->filename, basepath );
stringlistinit( &dirlist ); stringlistinit( &dirlist );
listdirectory( &dirlist, netpath, caseinsensitive ); listdirectory( &dirlist, netpath, caseinsensitive );
Q_strcpy( temp, basepath ); Q_strncpy( temp, basepath, sizeof( temp ) );
for( dirlistindex = 0; dirlistindex < dirlist.numstrings; dirlistindex++ ) for( dirlistindex = 0; dirlistindex < dirlist.numstrings; dirlistindex++ )
{ {
Q_strcpy( &temp[basepathlength], dirlist.strings[dirlistindex] ); Q_strncpy( &temp[basepathlength], dirlist.strings[dirlistindex], sizeof( temp ) - basepathlength );
if( matchpattern( temp, (char *)pattern, true ) ) if( matchpattern( temp, (char *)pattern, true ) )
{ {
@ -99,7 +99,7 @@ int FS_FileTime_DIR( searchpath_t *search, const char *filename )
{ {
char path[MAX_SYSPATH]; char path[MAX_SYSPATH];
Q_sprintf( path, "%s%s", search->filename, filename ); Q_snprintf( path, sizeof( path ), "%s%s", search->filename, filename );
return FS_SysFileTime( path ); return FS_SysFileTime( path );
} }
@ -107,6 +107,6 @@ file_t *FS_OpenFile_DIR( searchpath_t *search, const char *filename, const char
{ {
char path[MAX_SYSPATH]; char path[MAX_SYSPATH];
Q_sprintf( path, "%s%s", search->filename, filename ); Q_snprintf( path, sizeof( path ), "%s%s", search->filename, filename );
return FS_SysOpen( path, mode ); return FS_SysOpen( path, mode );
} }

2
filesystem/filesystem.c
View file

@ -2643,7 +2643,7 @@ search_t *FS_Search( const char *pattern, int caseinsensitive, int gamedironly )
{ {
search_t *search = NULL; search_t *search = NULL;
searchpath_t *searchpath; searchpath_t *searchpath;
int i, numfiles, numchars; int i, numfiles, numchars;
stringlist_t resultlist; stringlist_t resultlist;
if( pattern[0] == '.' || pattern[0] == ':' || pattern[0] == '/' || pattern[0] == '\\' ) if( pattern[0] == '.' || pattern[0] == ':' || pattern[0] == '/' || pattern[0] == '\\' )