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

Allocate strings with new instead of malloc

Browse Source
This commit is contained in:
Ted John
2017-07-01 23:40:53 +01:00
parent e9519d2d8b
commit 09bb7bfd6c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/drawing/sprite.cpp
View File

@@ -195,7 +195,11 @@ extern "C"
safe_strcpy(path, gConfigGeneral.rct1_path, sizeof(path));
safe_strcat_path(path, "Data", sizeof(path));
safe_strcat_path(path, "csg1i.dat", sizeof(path));
return String::Duplicate(Path::ResolveCasing(path));
auto fixedPath = Path::ResolveCasing(path);
utf8 * fixedPathC = new utf8[fixedPath.size() + 1];
Memory::Copy(fixedPathC, fixedPath.data(), fixedPath.size() + 1);
return fixedPathC;
}
static utf8 * gfx_get_csg_data_path()
@@ -217,7 +221,10 @@ extern "C"
safe_strcat_path(path, "csg1.dat", sizeof(path));
fixedPath = Path::ResolveCasing(path);
}
return String::Duplicate(fixedPath);
utf8 * fixedPathC = new utf8[fixedPath.size() + 1];
Memory::Copy(fixedPathC, fixedPath.data(), fixedPath.size() + 1);
return fixedPathC;
}
bool gfx_load_csg()
@@ -230,8 +237,8 @@ extern "C"
return false;
}
auto pathHeaderPath = std::unique_ptr<utf8>(gfx_get_csg_header_path());
auto pathDataPath = std::unique_ptr<utf8>(gfx_get_csg_data_path());
auto pathHeaderPath = std::unique_ptr<utf8[]>(gfx_get_csg_header_path());
auto pathDataPath = std::unique_ptr<utf8[]>(gfx_get_csg_data_path());
try
{
auto fileHeader = FileStream(pathHeaderPath.get(), FILE_MODE_OPEN);