tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 06:34:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in ConfigWriter::EmitIdentifier

Browse Source 
fixes #10538
This commit is contained in:
Gunnar Beutner 2015-11-04 19:05:47 +01:00
parent 09b2b054f5
commit a3fd33f8a1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/base/configwriter.cpp
View File

@ -146,9 +146,14 @@ void ConfigWriter::EmitIndent(std::ostream& fp, int indentLevel)
void ConfigWriter::EmitIdentifier(std::ostream& fp, const String& identifier, bool inAssignment) void ConfigWriter::EmitIdentifier(std::ostream& fp, const String& identifier, bool inAssignment)
{ {
static std::set<String> keywords; static std::set<String> keywords;
if (keywords.empty()) { static boost::mutex mutex;
const std::vector<String>& vkeywords = GetKeywords();
std::copy(vkeywords.begin(), vkeywords.end(), std::inserter(keywords, keywords.begin())); {
boost::mutex::scoped_lock lock(mutex);
if (keywords.empty()) {
const std::vector<String>& vkeywords = GetKeywords();
std::copy(vkeywords.begin(), vkeywords.end(), std::inserter(keywords, keywords.begin()));
}
} }
if (keywords.find(identifier) != keywords.end()) { if (keywords.find(identifier) != keywords.end()) {