octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9690 from german77/whoops 

yuzu: config: Avoid reading deleted object
This commit is contained in:
liamwhite 2023-01-28 22:28:38 -05:00 committed by GitHub
parent 40e7d78179 e84a441d75
commit 236f591bde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/yuzu/configuration/input_profiles.cpp
View File

@ -58,13 +58,16 @@ std::vector<std::string> InputProfiles::GetInputProfileNames() {
std::vector<std::string> profile_names; std::vector<std::string> profile_names;
profile_names.reserve(map_profiles.size()); profile_names.reserve(map_profiles.size());
for (const auto& [profile_name, config] : map_profiles) { auto it = map_profiles.cbegin();
while (it != map_profiles.cend()) {
const auto& [profile_name, config] = *it;
if (!ProfileExistsInFilesystem(profile_name)) { if (!ProfileExistsInFilesystem(profile_name)) {
DeleteProfile(profile_name); it = map_profiles.erase(it);
continue; continue;
} }
profile_names.push_back(profile_name); profile_names.push_back(profile_name);
++it;
} }
std::stable_sort(profile_names.begin(), profile_names.end()); std::stable_sort(profile_names.begin(), profile_names.end());