jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-05-26 22:01:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from danra/fix_SetSearchPath

Browse Source 
Fix cf_SetSearchPath bad memory access
This commit is contained in:
Louis Gombert
2024-04-18 18:48:18 +00:00
committed by GitHub
parent 6572274883 aaefe86a2a
commit 2760c3c3fc
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cfile/CFILE.cpp
View File

@@ -182,7 +182,7 @@ void cf_Close() {
// NULL-terminated
// list of file extensions, & the dir will only be searched
// for files with a matching extension Returns: true if directory added, else false
int cf_SetSearchPath(const char *path, char *ext, ...) {
int cf_SetSearchPath(const char *path, ...) {
if (strlen(path) >= _MAX_PATH)
return 0;
if (N_paths >= MAX_PATHS)
@@ -190,22 +190,27 @@ int cf_SetSearchPath(const char *path, char *ext, ...) {
// Get & store full path
ddio_GetFullPath(paths[N_paths].path, path);
// Set extenstions for this path
va_list exts;
va_start(exts, path);
const char *ext = va_arg(exts, const char *);
if (ext == NULL)
paths[N_paths].specific = 0;
else {
char **ep = &ext;
paths[N_paths].specific = 1;
while (*ep != NULL) {
if (N_extensions >= MAX_EXTENSIONS)
while (ext != NULL) {
if (N_extensions >= MAX_EXTENSIONS) {
va_end(exts);
return 0;
strncpy(extensions[N_extensions].ext, *ep, _MAX_EXT);
}
strncpy(extensions[N_extensions].ext, ext, _MAX_EXT);
extensions[N_extensions].pathnum = N_paths;
N_extensions++;
ep++;
ext = va_arg(exts, const char *);
}
}
// This path successfully set
N_paths++;
va_end(exts);
return 1;
}

8
lib/CFILE.H
View File

@@ -123,11 +123,11 @@ int cf_OpenLibrary(const char *libname);
void cf_CloseLibrary(int handle);
// Specify a directory to look in for files
// if ext==NULL, look in this directory for all files. If ext is non-null,
// it is a NULL-terminated list of file extensions. If extensions are
// specifed, the directory will only be searched for files that match
// Variable arguments is a NULL-terminated list of extensions
// If no extensions are specified, look in this directory for all files.
// Otherwise, the directory will only be searched for files that match
// one of the listed extensions.
int cf_SetSearchPath(const char *path, char *ext, ...);
int cf_SetSearchPath(const char *path, ...);
// Removes all search paths that have been added by cf_SetSearchPath
void cf_ClearAllSearchPaths(void);