From 1e20969143ef37139507069c6160a033321a1864 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 1 Jan 2004 10:25:05 +0000 Subject: [PATCH] sorry Mathieu, can't use va() in filesystem code, not safe. (this was causing the crosshairs to not work due to heavy reuse of va() buffers) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3776 d7cf8633-e32d-0410-b094-e92efae38249 --- fs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs.c b/fs.c index 8ba6759b..13203ec5 100644 --- a/fs.c +++ b/fs.c @@ -1103,9 +1103,8 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet) } else { - char* netpath; - - netpath = va ("%s/%s", search->filename, name); + char netpath[MAX_OSPATH]; + snprintf(netpath, sizeof(netpath), "%s/%s", search->filename, name); if (FS_SysFileExists (netpath)) { if (!quiet) @@ -1155,7 +1154,11 @@ qfile_t *FS_FOpenFile (const char *filename, qboolean quiet) // Found in the filesystem? if (i < 0) - return FS_OpenRead (va ("%s/%s", search->filename, filename), -1, -1); + { + char netpath[MAX_OSPATH]; + snprintf(netpath, sizeof(netpath), "%s/%s", search->filename, filename); + return FS_OpenRead(netpath, -1, -1); + } // So, we found it in a package... packfile = &search->pack->files[i]; -- 2.39.2