rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-22 16:54:27 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Work around locale-dependent regex parsing crash

Browse Source
This commit is contained in:
Philip Rebohle 2025-02-02 20:42:57 +01:00
parent 5569274a97
commit fcb4089bf1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/config/config.cpp
View File

@ -1214,8 +1214,16 @@ namespace dxvk {
const Config* findProfile(const ProfileList& profiles, const std::string& appName) { const Config* findProfile(const ProfileList& profiles, const std::string& appName) {
auto appConfig = std::find_if(profiles.begin(), profiles.end(), auto appConfig = std::find_if(profiles.begin(), profiles.end(),
[&appName] (const std::pair<const char*, Config>& pair) { [&appName] (const std::pair<const char*, Config>& pair) {
std::regex expr(pair.first, std::regex::extended | std::regex::icase); // With certain locales, regex parsing will simply crash. Using regex::imbue
return std::regex_search(appName, expr); // does not resolve this; only the global locale seems to matter here. Catch
// bad_alloc errors to work around this for now.
try {
std::regex expr(pair.first, std::regex::extended | std::regex::icase);
return std::regex_search(appName, expr);
} catch (const std::bad_alloc& e) {
Logger::err(str::format("Failed to parse regular expression: ", pair.first));
return false;
}
}); });
return appConfig != profiles.end() return appConfig != profiles.end()