mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1953 from janisozaur/file-not-found

Browse Source 
Safely handle 'file not found' or wrong parameters
This commit is contained in:
Ted John
2015-09-22 08:20:02 +01:00
parent a0d5d592c2 16eb4666ee
commit 976ea0d775
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/linux.c
View File

@@ -297,7 +297,7 @@ bool platform_enumerate_files_next(int handle, file_info *outFileInfo)
enumFileInfo = &_enumerateFileInfoList[handle]; enumFileInfo = &_enumerateFileInfoList[handle];
log_verbose("handle = %d", handle); log_verbose("handle = %d", handle);
if (enumFileInfo->handle < enumFileInfo->cnt) { if ((handle >= 0) && (enumFileInfo->handle < enumFileInfo->cnt)) {
result = true; result = true;
} else { } else {
result = false; result = false;
@@ -328,6 +328,10 @@ void platform_enumerate_files_end(int handle)
int i; int i;
enumerate_file_info *enumFileInfo; enumerate_file_info *enumFileInfo;
if (handle < 0)
{
return;
}
enumFileInfo = &_enumerateFileInfoList[handle]; enumFileInfo = &_enumerateFileInfoList[handle];
int cnt = enumFileInfo->cnt; int cnt = enumFileInfo->cnt;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
@@ -425,7 +429,7 @@ bool platform_enumerate_directories_next(int handle, utf8 *path)
enumFileInfo = &_enumerateFileInfoList[handle]; enumFileInfo = &_enumerateFileInfoList[handle];
log_verbose("handle = %d", handle); log_verbose("handle = %d", handle);
if (enumFileInfo->handle < enumFileInfo->cnt) { if ((handle >= 0) && (enumFileInfo->handle < enumFileInfo->cnt)) {
result = true; result = true;
} else { } else {
result = false; result = false;
@@ -457,6 +461,10 @@ void platform_enumerate_directories_end(int handle)
int i; int i;
enumerate_file_info *enumFileInfo; enumerate_file_info *enumFileInfo;
if (handle < 0)
{
return;
}
enumFileInfo = &_enumerateFileInfoList[handle]; enumFileInfo = &_enumerateFileInfoList[handle];
int cnt = enumFileInfo->cnt; int cnt = enumFileInfo->cnt;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {