INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-13 19:17:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

yuzu qt: Revert some usages of string_view

Browse Source 
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.
This commit is contained in:
lat9nq
2021-06-02 15:05:45 -04:00
parent 377cd301b3
commit c41451af75
7 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/yuzu/configuration/configure_per_game.cpp
View File

@ -3,10 +3,13 @@
// Refer to the license.txt file included.
#include <algorithm>
#include <filesystem>
#include <memory>
#include <string>
#include <utility>
#include <fmt/format.h>
#include <QAbstractButton>
#include <QCheckBox>
#include <QDialogButtonBox>
@ -18,6 +21,7 @@
#include <QTimer>
#include <QTreeView>
#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<Ui::ConfigurePerGame>()), 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>(config_file_name, Config::ConfigType::PerGameConfig);
Settings::SetConfiguringGlobal(false);