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

Remove malloc in LanguagePack.cpp (#19111)

Browse Source
This commit is contained in:
Michael Steenbeek
2023-01-11 00:18:13 +01:00
committed by GitHub
parent 07d5f73f5d
commit f68b705f9f
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/localisation/LanguagePack.cpp
View File

@@ -70,7 +70,8 @@ public:
Guard::ArgumentNotNull(path);
// Load file directly into memory
utf8* fileData = nullptr;
std::vector<utf8> fileData;
try
{
OpenRCT2::FileStream fs = OpenRCT2::FileStream(path, OpenRCT2::FILE_MODE_OPEN);
@@ -81,22 +82,16 @@ public:
throw IOException("Language file too large.");
}
fileData = Memory::Allocate<utf8>(fileLength + 1);
fs.Read(fileData, fileLength);
fileData[fileLength] = '\0';
fileData.resize(fileLength);
fs.Read(fileData.data(), fileLength);
}
catch (const std::exception& ex)
{
Memory::Free(fileData);
log_error("Unable to open %s: %s", path, ex.what());
return nullptr;
}
// Parse the memory as text
auto result = FromText(id, fileData);
Memory::Free(fileData);
return result;
return FromText(id, fileData.data());
}
static std::unique_ptr<LanguagePack> FromText(uint16_t id, const utf8* text)