Merge pull request #4833 from MykBamberg/master

[rcore] Use snprintf to prevent buffer overflow in path construction
This commit is contained in:
Ray 2025-03-12 12:40:25 +01:00 committed by GitHub
commit 654d5c80c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -3688,12 +3688,16 @@ static void ScanDirectoryFiles(const char *basePath, FilePathList *files, const
(strcmp(dp->d_name, "..") != 0))
{
#if defined(_WIN32)
sprintf(path, "%s\\%s", basePath, dp->d_name);
int realPathLength = snprintf(path, sizeof(path) - 1, "%s\\%s", basePath, dp->d_name);
#else
sprintf(path, "%s/%s", basePath, dp->d_name);
int realPathLength = snprintf(path, sizeof(path) - 1, "%s/%s", basePath, dp->d_name);
#endif
if (filter != NULL)
if (realPathLength < 0 || realPathLength >= sizeof(path))
{
TRACELOG(LOG_WARNING, "FILEIO: Path longer than %d characters (%s...)", MAX_FILEPATH_LENGTH, basePath);
}
else if (filter != NULL)
{
if (IsPathFile(path))
{
@ -3742,12 +3746,16 @@ static void ScanDirectoryFilesRecursively(const char *basePath, FilePathList *fi
{
// Construct new path from our base path
#if defined(_WIN32)
sprintf(path, "%s\\%s", basePath, dp->d_name);
int realPathLength = snprintf(path, sizeof(path) - 1, "%s\\%s", basePath, dp->d_name);
#else
sprintf(path, "%s/%s", basePath, dp->d_name);
int realPathLength = snprintf(path, sizeof(path) - 1, "%s/%s", basePath, dp->d_name);
#endif
if (IsPathFile(path))
if (realPathLength < 0 || realPathLength >= sizeof(path))
{
TRACELOG(LOG_WARNING, "FILEIO: Path longer than %d characters (%s...)", MAX_FILEPATH_LENGTH, basePath);
}
else if (IsPathFile(path))
{
if (filter != NULL)
{