mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix memory leak when loading title sequence. 

The buffer for loading the title sequence script was allocated but not free'd
This commit is contained in:
ceeac 2017-05-26 09:39:08 +02:00
parent a64e08f997
commit bed408ef3f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/title/TitleSequence.cpp
View File

@ -54,7 +54,7 @@ extern "C"
TitleSequence * LoadTitleSequence(const utf8 * path) TitleSequence * LoadTitleSequence(const utf8 * path)
{ {
size_t scriptLength; size_t scriptLength;
char * script; utf8 * script;
std::vector<utf8 *> saves; std::vector<utf8 *> saves;
bool isZip; bool isZip;
@ -70,7 +70,7 @@ extern "C"
return nullptr; return nullptr;
} }
script = (char *)zip->GetFileData("script.txt", &scriptLength); script = (utf8 *)zip->GetFileData("script.txt", &scriptLength);
if (script == nullptr) if (script == nullptr)
{ {
Console::Error::WriteLine("Unable to open script.txt in '%s'", path); Console::Error::WriteLine("Unable to open script.txt in '%s'", path);
@ -88,7 +88,7 @@ extern "C"
utf8 scriptPath[MAX_PATH]; utf8 scriptPath[MAX_PATH];
String::Set(scriptPath, sizeof(scriptPath), path); String::Set(scriptPath, sizeof(scriptPath), path);
Path::Append(scriptPath, sizeof(scriptPath), "script.txt"); Path::Append(scriptPath, sizeof(scriptPath), "script.txt");
script = (char *)ReadScriptFile(scriptPath, &scriptLength); script = (utf8 *)ReadScriptFile(scriptPath, &scriptLength);
if (script == nullptr) if (script == nullptr)
{ {
Console::Error::WriteLine("Unable to open '%s'", scriptPath); Console::Error::WriteLine("Unable to open '%s'", scriptPath);
@ -100,6 +100,7 @@ extern "C"
} }
std::vector<TitleCommand> commands = LegacyScriptRead(script, scriptLength, saves); std::vector<TitleCommand> commands = LegacyScriptRead(script, scriptLength, saves);
Memory::Free(script);
TitleSequence * seq = CreateTitleSequence(); TitleSequence * seq = CreateTitleSequence();
seq->Name = Path::GetFileNameWithoutExtension(path); seq->Name = Path::GetFileNameWithoutExtension(path);