loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix lack of mutex locking in some GameCache methods

Browse Source
This commit is contained in:
Oliver Hamlet
2020-07-11 18:33:04 +01:00
parent 27a52fe105
commit 402564c396
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/game/game_cache.cpp
+16 -3
View File
@@ -36,11 +36,18 @@ using std::string;
namespace loot {
GameCache::GameCache() {}
GameCache::GameCache(const GameCache& cache) :
plugins_(cache.plugins_),
archivePaths_(cache.archivePaths_) {}
GameCache::GameCache(const GameCache& cache) {
lock_guard<mutex> lock(mutex_);
lock_guard<mutex> otherLock(cache.mutex_);
plugins_ = cache.plugins_;
archivePaths_ = cache.archivePaths_;
}
GameCache& GameCache::operator=(const GameCache& cache) {
lock_guard<mutex> lock(mutex_);
lock_guard<mutex> otherLock(cache.mutex_);
if (&cache != this) {
plugins_ = cache.plugins_;
archivePaths_ = cache.archivePaths_;
@@ -50,6 +57,8 @@ GameCache& GameCache::operator=(const GameCache& cache) {
}
std::set<std::shared_ptr<const Plugin>> GameCache::GetPlugins() const {
lock_guard<mutex> lock(mutex_);
std::set<std::shared_ptr<const Plugin>> output;
std::transform(
begin(plugins_),
@@ -64,6 +73,8 @@ std::set<std::shared_ptr<const Plugin>> GameCache::GetPlugins() const {
std::shared_ptr<const Plugin> GameCache::GetPlugin(
const std::string& pluginName) const {
lock_guard<mutex> lock(mutex_);
auto it = plugins_.find(NormalizeFilename(pluginName));
if (it != end(plugins_))
return it->second;
@@ -84,6 +95,8 @@ void GameCache::AddPlugin(const Plugin&& plugin) {
}
std::set<std::filesystem::path> GameCache::GetArchivePaths() const {
lock_guard<mutex> lock(mutex_);
return archivePaths_;
}