From f4df6be8aec3438189ce003d147201577123ce0f Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Wed, 20 Jul 2022 23:50:43 -0700 Subject: [PATCH] Remove some calls to free (#17577) --- src/openrct2-ui/windows/Multiplayer.cpp | 9 +++++---- src/openrct2-ui/windows/TrackList.cpp | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index ec19b09887..26895a2f85 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -347,9 +348,9 @@ static ScreenCoordsXY WindowMultiplayerInformationGetSize() // Server name is displayed word-wrapped, so figure out how high it will be. { - utf8* buffer = _strdup(network_get_server_name()); + utf8* buffer = String::Duplicate(network_get_server_name()); gfx_wrap_string(buffer, width, FontSpriteBase::MEDIUM, &numLines); - free(buffer); + delete buffer; height += ++numLines * lineHeight + (LIST_ROW_HEIGHT / 2); } @@ -357,9 +358,9 @@ static ScreenCoordsXY WindowMultiplayerInformationGetSize() const utf8* descString = network_get_server_description(); if (!str_is_null_or_empty(descString)) { - utf8* buffer = _strdup(descString); + utf8* buffer = String::Duplicate(descString); gfx_wrap_string(buffer, width, FontSpriteBase::MEDIUM, &numLines); - free(buffer); + delete buffer; height += ++numLines * lineHeight + (LIST_ROW_HEIGHT / 2); } diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 4d098b572d..4804bed4e6 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -241,8 +241,8 @@ public: // Dispose track list for (auto& trackDesign : _trackDesigns) { - free(trackDesign.name); - free(trackDesign.path); + delete trackDesign.name; + delete trackDesign.path; } _trackDesigns.clear();