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

Merge pull request #8548 from janisozaur/memleak-20190102

Browse Source 
Plug memory leaks
This commit is contained in:
Michał Janiszewski
2019-01-02 21:23:09 +01:00
committed by GitHub
parent 7c8144b57d 37535f4642
commit b7d1d49956
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/config/Config.cpp
View File

@@ -747,6 +747,7 @@ void config_release()
SafeFree(gConfigInterface.current_theme_preset);
SafeFree(gConfigInterface.current_title_sequence_preset);
SafeFree(gConfigSound.device);
SafeFree(gConfigTwitch.api_url);
SafeFree(gConfigTwitch.channel);
SafeFree(gConfigNetwork.player_name);
SafeFree(gConfigNetwork.listen_address);

4
src/openrct2/object/ObjectFactory.cpp
View File

@@ -367,7 +367,9 @@ namespace ObjectFactory
}
auto fileDataRetriever = ZipDataRetriever(*archive);
return CreateObjectFromJson(objectRepository, jRoot, &fileDataRetriever);
Object* obj = CreateObjectFromJson(objectRepository, jRoot, &fileDataRetriever);
json_decref(jRoot);
return obj;
}
catch (const std::exception& e)
{

1
test/tests/ImageImporterTests.cpp
View File

@@ -55,4 +55,5 @@ TEST_F(ImageImporterTests, Import_Logo)
ASSERT_NE(nullptr, result.Buffer);
auto hash = GetHash(result.Buffer, result.BufferLength);
ASSERT_EQ(0xCEF27C7D, hash);
free(result.Buffer);
}