Browse Source

REVIEWED: `ScanDirectoryFiles*()` #4833

pull/4839/head
Ray 11 months ago
parent
commit
749a512f13
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      src/rcore.c

+ 6
- 6
src/rcore.c View File

@ -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, k">sizeof(path) - 1, "%s\\%s", basePath, dp->d_name);
int pathLength = snprintf(path, n">MAX_FILEPATH_LENGTH - 1, "%s\\%s", basePath, dp->d_name);
#else #else
int realPathLength = snprintf(path, k">sizeof(path) - 1, "%s/%s", basePath, dp->d_name);
int pathLength = snprintf(path, n">MAX_FILEPATH_LENGTH - 1, "%s/%s", basePath, dp->d_name);
#endif #endif
if (n">realPathLength < 0 || n">realPathLength >= sizeof(path))
if (p">(pathLength < 0) || p">(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, k">sizeof(path) - 1, "%s\\%s", basePath, dp->d_name);
int pathLength = snprintf(path, n">MAX_FILEPATH_LENGTH - 1, "%s\\%s", basePath, dp->d_name);
#else #else
int realPathLength = snprintf(path, k">sizeof(path) - 1, "%s/%s", basePath, dp->d_name);
int pathLength = snprintf(path, n">MAX_FILEPATH_LENGTH - 1, "%s/%s", basePath, dp->d_name);
#endif #endif
if (n">realPathLength < 0 || n">realPathLength >= sizeof(path))
if (p">(pathLength < 0) || p">(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…
Cancel
Save