From 3e713e5c2f0bac09cb30ba9400363c5d3caa4183 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Thu, 16 Feb 2023 20:45:48 +0100 Subject: [PATCH] Fix memory leak in GetFileName (#19420) --- src/openrct2/core/ZipAndroid.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/openrct2/core/ZipAndroid.cpp b/src/openrct2/core/ZipAndroid.cpp index 8ee893193f..6b1083fa9a 100644 --- a/src/openrct2/core/ZipAndroid.cpp +++ b/src/openrct2/core/ZipAndroid.cpp @@ -16,6 +16,7 @@ # include # include +# include using namespace OpenRCT2; @@ -76,11 +77,7 @@ public: jstring jniString = (jstring)env->CallObjectMethod(_zip, fileNameMethod, (jint)index); const char* jniChars = env->GetStringUTFChars(jniString, nullptr); - - utf8* string = (char*)malloc(strlen(jniChars) + 1); - std::memcpy((void*)string, jniChars, strlen(jniChars)); - string[strlen(jniChars)] = 0x00; - + std::string string = jniChars; env->ReleaseStringUTFChars(jniString, jniChars); return string;