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

Take care not to overflow buffers in platform_resolve_user_data_path (#3761)

Browse Source
This commit is contained in:
Michał Janiszewski
2016-05-28 10:31:02 +02:00
committed by Ted John
parent c645d24c8d
commit 1cdbd1e459
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/platform/posix.c
View File

@@ -666,16 +666,24 @@ void platform_resolve_user_data_path()
log_error("Failed to create directory \"%s\", make sure you have permissions.", gCustomUserDataPath);
return;
}
if (realpath(gCustomUserDataPath, _userDataDirectoryPath) == NULL) {
char *path;
if ((path = realpath(gCustomUserDataPath, NULL)) == NULL) {
log_error("Could not resolve path \"%s\"", gCustomUserDataPath);
return;
}
safe_strcpy(_userDataDirectoryPath, path, MAX_PATH);
free(path);
// Ensure path ends with separator
int len = strlen(_userDataDirectoryPath);
if (_userDataDirectoryPath[len - 1] != separator[0]) {
strncat(_userDataDirectoryPath, separator, MAX_PATH - 1);
}
log_verbose("User data path resolved to: %s", _userDataDirectoryPath);
if (!platform_directory_exists(_userDataDirectoryPath)) {
log_error("Custom user data directory %s does not exist", _userDataDirectoryPath);
}
return;
}
@@ -694,6 +702,7 @@ void platform_resolve_user_data_path()
free(w_buffer);
safe_strcpy(_userDataDirectoryPath, path, MAX_PATH);
free(path);
log_verbose("User data path resolved to: %s", _userDataDirectoryPath);
}
void platform_get_openrct_data_path(utf8 *outPath)