strncpy -> {strlcpy,memcpy}. Replaced the "forceloop" boolean in "channel_t" by a...

[xonotic/darkplaces.git] / fs.c

diff --git a/fs.c b/fs.c
index 90ba0702bd5b88a617d8ca6dfdc8f7dfe4091287..e180f13d4ce077518f88b6e45e12fa0c7e096dc6 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1900,7 +1900,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
        if (separator < colon)
                separator = colon;
        basepathlength = separator - pattern;
-       basepath = Z_Malloc(basepathlength + 1);
+       basepath = Mem_Alloc (tempmempool, basepathlength + 1);
        if (basepathlength)
                memcpy(basepath, pattern, basepathlength);
        basepath[basepathlength] = 0;
@@ -2004,7 +2004,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
                        stringlistfree(liststart);
        }
 
-       Z_Free(basepath);
+       Mem_Free(basepath);
        return search;
 }