From c41f8629204635e6e4bb633a837fbd1c32f3f9eb Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Thu, 4 Oct 2018 01:42:22 -0600 Subject: [PATCH] Fix some memory leaks --- .../drawing/engines/HardwareDisplayDrawingEngine.cpp | 5 +++++ src/openrct2/network/ServerList.cpp | 8 ++++---- src/openrct2/object/StringTable.cpp | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index cbdf7b9e40..7cae9b22e2 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -92,6 +92,11 @@ public: void Resize(uint32_t width, uint32_t height) override { + if (width == 0 || height == 0) + { + return; + } + if (_screenTexture != nullptr) { SDL_DestroyTexture(_screenTexture); diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index d5d86f6cab..0148492a37 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -34,11 +34,11 @@ std::vector server_list_read() for (size_t i = 0; i < numEntries; i++) { server_entry serverInfo; - serverInfo.address = fs.ReadString(); - serverInfo.name = fs.ReadString(); + serverInfo.address = fs.ReadStdString(); + serverInfo.name = fs.ReadStdString(); serverInfo.requiresPassword = false; - serverInfo.description = fs.ReadString(); - serverInfo.version = String::Duplicate(""); + serverInfo.description = fs.ReadStdString(); + serverInfo.version = ""; serverInfo.favourite = true; serverInfo.players = 0; serverInfo.maxplayers = 0; diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index 9e67ffc835..bcc3aa056f 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -110,7 +110,7 @@ void StringTable::SetString(uint8_t id, uint8_t language, const std::string& tex StringTableEntry entry; entry.Id = id; entry.LanguageId = language; - entry.Text = String::Duplicate(text); + entry.Text = text; _strings.push_back(entry); }