From c41451af75520a19b050347bb9c267b69773ff0a Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Wed, 2 Jun 2021 15:05:45 -0400 Subject: yuzu qt: Revert some usages of string_view Causes a heap-use-after free reported by AddressSanitizer. This makes use of std::filesystem::path, but due to that we have to use their string() function which may not work for all characters. --- src/yuzu/configuration/configure_per_game.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/yuzu/configuration/configure_per_game.cpp') diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index 7dfcf150c..a1d434aca 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/src/yuzu/configuration/configure_per_game.cpp @@ -3,10 +3,13 @@ // Refer to the license.txt file included. #include +#include #include #include #include +#include + #include #include #include @@ -18,6 +21,7 @@ #include #include +#include "common/fs/fs_util.h" #include "common/fs/path_util.h" #include "core/core.h" #include "core/file_sys/control_metadata.h" @@ -31,10 +35,11 @@ #include "yuzu/uisettings.h" #include "yuzu/util/util.h" -ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, std::string_view file_name) +ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, const std::string& file_name) : QDialog(parent), ui(std::make_unique()), title_id(title_id) { - const auto config_file_name = - title_id == 0 ? Common::FS::GetFilename(file_name) : fmt::format("{:016X}", title_id); + const auto file_path = std::filesystem::path(Common::FS::ToU8String(file_name)); + const auto config_file_name = title_id == 0 ? Common::FS::PathToUTF8String(file_path.filename()) + : fmt::format("{:016X}", title_id); game_config = std::make_unique(config_file_name, Config::ConfigType::PerGameConfig); Settings::SetConfiguringGlobal(false); -- cgit v1.2.3