From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 16 Dec 2003 15:59:21 +0000 (+0000)
Subject: fix a filesystem directory listing bug in FS_Search
X-Git-Tag: xonotic-v0.1.0preview~6206
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4bc0a6bb5b4331e7cea9f67a0e7e6501b2f1646;p=xonotic%2Fdarkplaces.git

fix a filesystem directory listing bug in FS_Search


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3736 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/fs.c b/fs.c
index 3143e7ba..beddbec6 100644
--- a/fs.c
+++ b/fs.c
@@ -1939,8 +1939,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
 			{
 				for (dirfile = dir;dirfile;dirfile = dirfile->next)
 				{
-					memcpy(temp, basepath, basepathlength);
-					strcpy(temp + basepathlength, dirfile->text);
+					snprintf(temp, sizeof(temp), "%s/%s", basepath, dirfile->text);
 					if (matchpattern(temp, (char *)pattern, true))
 					{
 						for (listtemp = liststart;listtemp;listtemp = listtemp->next)