REVIEWED: ScanDirectoryFiles*()
#4833
This commit is contained in:
parent
654d5c80c2
commit
749a512f13
1 changed files with 6 additions and 6 deletions
12
src/rcore.c
12
src/rcore.c
|
@ -3688,12 +3688,12 @@ static void ScanDirectoryFiles(const char *basePath, FilePathList *files, const
|
||||||
(strcmp(dp->d_name, "..") != 0))
|
(strcmp(dp->d_name, "..") != 0))
|
||||||
{
|
{
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
int realPathLength = snprintf(path, sizeof(path) - 1, "%s\\%s", basePath, dp->d_name);
|
int pathLength = snprintf(path, MAX_FILEPATH_LENGTH - 1, "%s\\%s", basePath, dp->d_name);
|
||||||
#else
|
#else
|
||||||
int realPathLength = snprintf(path, sizeof(path) - 1, "%s/%s", basePath, dp->d_name);
|
int pathLength = snprintf(path, MAX_FILEPATH_LENGTH - 1, "%s/%s", basePath, dp->d_name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (realPathLength < 0 || realPathLength >= sizeof(path))
|
if ((pathLength < 0) || (pathLength >= MAX_FILEPATH_LENGTH))
|
||||||
{
|
{
|
||||||
TRACELOG(LOG_WARNING, "FILEIO: Path longer than %d characters (%s...)", MAX_FILEPATH_LENGTH, basePath);
|
TRACELOG(LOG_WARNING, "FILEIO: Path longer than %d characters (%s...)", MAX_FILEPATH_LENGTH, basePath);
|
||||||
}
|
}
|
||||||
|
@ -3746,12 +3746,12 @@ static void ScanDirectoryFilesRecursively(const char *basePath, FilePathList *fi
|
||||||
{
|
{
|
||||||
// Construct new path from our base path
|
// Construct new path from our base path
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
int realPathLength = snprintf(path, sizeof(path) - 1, "%s\\%s", basePath, dp->d_name);
|
int pathLength = snprintf(path, MAX_FILEPATH_LENGTH - 1, "%s\\%s", basePath, dp->d_name);
|
||||||
#else
|
#else
|
||||||
int realPathLength = snprintf(path, sizeof(path) - 1, "%s/%s", basePath, dp->d_name);
|
int pathLength = snprintf(path, MAX_FILEPATH_LENGTH - 1, "%s/%s", basePath, dp->d_name);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (realPathLength < 0 || realPathLength >= sizeof(path))
|
if ((pathLength < 0) || (pathLength >= MAX_FILEPATH_LENGTH))
|
||||||
{
|
{
|
||||||
TRACELOG(LOG_WARNING, "FILEIO: Path longer than %d characters (%s...)", MAX_FILEPATH_LENGTH, basePath);
|
TRACELOG(LOG_WARNING, "FILEIO: Path longer than %d characters (%s...)", MAX_FILEPATH_LENGTH, basePath);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue